Attachment #67967 for bug #172820




package org.eclipse.jdt.core.tests.compiler.regression;

import java.io.File;
import java.io.FilenameFilter;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;

public static Test suite() {
	return buildUniqueComplianceTestSuite(testClass(), COMPLIANCE_1_5);
}
	private String getHYClasses() {
		String jre = System.getProperty("java.home");
		FilenameFilter jarFilter = new FilenameFilter() {
			public boolean accept(File dir, String name) {
				return (name.endsWith(".jar") && !name.endsWith("-src.jar"));
			}
		};
		String libraryClasses = "";
		String path_separator = System.getProperty("path.separator");
		String[] jars = new File(jre + "/lib/boot/").list(jarFilter);
		for (int i = 0; i < jars.length; i++) {
			libraryClasses = libraryClasses + jre + "/lib/boot/" + jars[i] + path_separator;
		}
		return libraryClasses;
	}
	
	private String getLibraryClasses() {
		if (Util.isMacOS()) {
			return JRE_HOME_DIR + "/../Classes/classes.jar"; 
		}
		final String vmName = System.getProperty("java.vm.name");
		if ("DRLVM".equals(vmName)) {
            return getHYClasses();
        }
		return JRE_HOME_DIR + "/lib/rt.jar";
	}
	

Lines 66-71 Link Here

(-)eut_old_eclipse172820/org/eclipse/jdt/core/tests/runtime/LocalVMLauncher.java (+4 lines)
66	if ("IBM J9SE VM".equals(vmName)) {	66	if ("IBM J9SE VM".equals(vmName)) {
67	return new SideCarJ9VMLauncher();	67	return new SideCarJ9VMLauncher();
68	}	68	}
		69	// DRLVM works ok when launching in the same way as SideCarVM
		70	if ("DRLVM".equals(vmName)) {
		71	return new SideCarVMLauncher();
		72	}
69	return new SideCarVMLauncher();	73	return new SideCarVMLauncher();
70	}	74	}
71	/**	75	/**





import java.io.File;
import java.io.FileInputStream;
import java.io.FilenameFilter;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;

			toNativePath(jreDir + "/lib/rt.jar")
		};				
	}
	if ("DRLVM".equals(vmName)) {
        FilenameFilter jarFilter = new FilenameFilter() {
                public boolean accept(File dir, String name) {
                        return name.endsWith(".jar") & !name.endsWith("-src.jar");
                }
        };
        String[] jars = new File(jreDir + "/lib/boot/").list(jarFilter);
        for (int i = 0; i < jars.length; i++) {
                jars[i] = toNativePath(jreDir + "/lib/boot/" + jars[i]);
        }
        return jars;
    }
	return new String[] { 
		toNativePath(jreDir + "/lib/core.jar"),
		toNativePath(jreDir + "/lib/security.jar"),

Return to bug 172820

Lines 11-16 Link Here

(-)eut_old_eclipse172820/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java (-1 / +21 lines)
11	package org.eclipse.jdt.core.tests.compiler.regression;	11	package org.eclipse.jdt.core.tests.compiler.regression;
12		12
13	import java.io.File;	13	import java.io.File;
		14	import java.io.FilenameFilter;
14	import java.io.FileNotFoundException;	15	import java.io.FileNotFoundException;
15	import java.io.FileOutputStream;	16	import java.io.FileOutputStream;
16	import java.io.IOException;	17	import java.io.IOException;
Lines 43-53 Link Here
43	public static Test suite() {	44	public static Test suite() {
44	return buildUniqueComplianceTestSuite(testClass(), COMPLIANCE_1_5);	45	return buildUniqueComplianceTestSuite(testClass(), COMPLIANCE_1_5);
45	}	46	}
46		47	private String getHYClasses() {
		48	String jre = System.getProperty("java.home");
		49	FilenameFilter jarFilter = new FilenameFilter() {
		50	public boolean accept(File dir, String name) {
		51	return (name.endsWith(".jar") && !name.endsWith("-src.jar"));
		52	}
		53	};
		54	String libraryClasses = "";
		55	String path_separator = System.getProperty("path.separator");
		56	String[] jars = new File(jre + "/lib/boot/").list(jarFilter);
		57	for (int i = 0; i < jars.length; i++) {
		58	libraryClasses = libraryClasses + jre + "/lib/boot/" + jars[i] + path_separator;
		59	}
		60	return libraryClasses;
		61	}
		62
47	private String getLibraryClasses() {	63	private String getLibraryClasses() {
48	if (Util.isMacOS()) {	64	if (Util.isMacOS()) {
49	return JRE_HOME_DIR + "/../Classes/classes.jar";	65	return JRE_HOME_DIR + "/../Classes/classes.jar";
50	}	66	}
		67	final String vmName = System.getProperty("java.vm.name");
		68	if ("DRLVM".equals(vmName)) {
		69	return getHYClasses();
		70	}
51	return JRE_HOME_DIR + "/lib/rt.jar";	71	return JRE_HOME_DIR + "/lib/rt.jar";
52	}	72	}
53		73

Lines 12-17 Link Here

(-)eut_old_eclipse172820/org/eclipse/jdt/core/tests/util/Util.java (+13 lines)
12		12
13	import java.io.File;	13	import java.io.File;
14	import java.io.FileInputStream;	14	import java.io.FileInputStream;
		15	import java.io.FilenameFilter;
15	import java.io.FileNotFoundException;	16	import java.io.FileNotFoundException;
16	import java.io.FileOutputStream;	17	import java.io.FileOutputStream;
17	import java.io.IOException;	18	import java.io.IOException;
Lines 505-510 Link Here
505	toNativePath(jreDir + "/lib/rt.jar")	506	toNativePath(jreDir + "/lib/rt.jar")
506	};	507	};
507	}	508	}
		509	if ("DRLVM".equals(vmName)) {
		510	FilenameFilter jarFilter = new FilenameFilter() {
		511	public boolean accept(File dir, String name) {
		512	return name.endsWith(".jar") & !name.endsWith("-src.jar");
		513	}
		514	};
		515	String[] jars = new File(jreDir + "/lib/boot/").list(jarFilter);
		516	for (int i = 0; i < jars.length; i++) {
		517	jars[i] = toNativePath(jreDir + "/lib/boot/" + jars[i]);
		518	}
		519	return jars;
		520	}
508	return new String[] {	521	return new String[] {
509	toNativePath(jreDir + "/lib/core.jar"),	522	toNativePath(jreDir + "/lib/core.jar"),
510	toNativePath(jreDir + "/lib/security.jar"),	523	toNativePath(jreDir + "/lib/security.jar"),