1 files changed, 17 insertions, 5 deletions

diff --git a/org.eclipse.jdt.compiler.tool.tests/src/org/eclipse/jdt/compiler/tool/tests/CompilerInvocationTests.java b/org.eclipse.jdt.compiler.tool.tests/src/org/eclipse/jdt/compiler/tool/tests/CompilerInvocationTests.java
index a2f7590a53..bdf11f7c1b 100644
--- a/org.eclipse.jdt.compiler.tool.tests/src/org/eclipse/jdt/compiler/tool/tests/CompilerInvocationTests.java
+++ b/org.eclipse.jdt.compiler.tool.tests/src/org/eclipse/jdt/compiler/tool/tests/CompilerInvocationTests.java
@@ -32,21 +32,22 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.logging.LogRecord;
 
+import javax.lang.model.SourceVersion;
 import javax.tools.FileObject;
 import javax.tools.ForwardingJavaFileObject;
+import javax.tools.JavaCompiler.CompilationTask;
 import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
 import javax.tools.StandardJavaFileManager;
 import javax.tools.StandardLocation;
-import javax.tools.JavaCompiler.CompilationTask;
-import javax.tools.JavaFileObject.Kind;
-
-import junit.framework.Test;
 
 import org.eclipse.jdt.internal.compiler.batch.Main;
 import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
 import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader;
 import org.eclipse.jdt.internal.compiler.classfmt.ClassFormatException;
 
+import junit.framework.Test;
+
 public class CompilerInvocationTests extends AbstractCompilerToolTest {
 	static {
 //		TESTS_NAMES = new String[] { "test019_sourcepath_without_destination" };
@@ -62,7 +63,14 @@ public static Test suite() {
 public static Class<CompilerInvocationTests> testClass() {
 	return CompilerInvocationTests.class;
 }
-
+private boolean isOnJRE9() {
+	try {
+		SourceVersion.valueOf("RELEASE_9");
+	} catch(IllegalArgumentException iae) {
+		return false;
+	}
+	return true;
+}
 protected void checkClassFiles(String[] fileNames) {
 	for (int i = 0, l = fileNames.length; i < l; i++) {
 		ClassFileReader reader = null;
@@ -204,6 +212,7 @@ class GetJavaFileForInputDetector extends GetJavaFileDetector  {
 			return super.openReader(ignoreEncodingErrors);
 		}
 	}
+	@Override
 	JavaFileObject detector(JavaFileObject original) {
 		if (original != null && original.getKind() == this.discriminatingKind
 				&& (this.discriminatingSuffix == null || original.getName().endsWith(this.discriminatingSuffix))) {
@@ -250,6 +259,7 @@ class GetJavaFileForOutputDetector extends GetJavaFileDetector  {
 			return super.openWriter();
 		}
 	}
+	@Override
 	JavaFileObject detector(JavaFileObject original) {
 		if (original != null && original.getKind() == Kind.CLASS
 				&& (this.discriminatingSuffix == null || original.getName().endsWith(this.discriminatingSuffix))) {
@@ -553,6 +563,8 @@ public void test009_options_consumption() throws IOException {
 	StandardJavaFileManager ecjStandardJavaFileManager = 
 		COMPILER.getStandardFileManager(null /* diagnosticListener */, null /* locale */, null /* charset */);
 	for (String option: CompilerToolTests.ONE_ARG_OPTIONS) {
+		if (isOnJRE9() && (option.equals("-extdirs") || option.equals("-endorseddirs")))
+				continue;
 		if (ecjStandardJavaFileManager.isSupportedOption(option) != -1) { // some options that the compiler support could well not be supported by the file manager
 			Iterator<String> remaining = remainingAsList.iterator();
 			assertTrue("does not support " + option + " option", ecjStandardJavaFileManager.handleOption(option, remaining));