All tests (even the meaningless ones) run.

Author: fjalvingh

plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java

@@ -57,6 +57,7 @@
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -259,7 +260,7 @@ public CompilerResult performCompile( CompilerConfiguration config )
 		args.add(config.getOutputLocation());
 
 		//-- Write .class files even when error occur, but make sure methods with compile errors do abort when called
-		args.add("-proceedOnError:Fatal");
+		//args.add("-proceedOnError:Fatal"); probably not a good plan as it will cause incremental compile to not work
 
 		//-- classpath
 		List<String> classpathEntries = config.getClasspathEntries();
@@ -280,14 +281,22 @@ public CompilerResult performCompile( CompilerConfiguration config )
 			args.add("-log");
 			args.add(errorF.toString());
 
+			// Add all sources.
+			int argCount = args.size();
 			for(String source : config.getSourceLocations()) {
 				File srcFile = new File(source);
 				if(srcFile.exists()) {
 					Set<String> ss = getSourceFilesForSourceRoot( config, source );
 					args.addAll(ss);
 				}
 			}
-
+			for(String extraSourceDir : extraSourceDirs) {
+				args.add(extraSourceDir);
+			}
+			if(args.size() == argCount) {
+				//-- Nothing to do -> bail out
+				return new CompilerResult(true, Collections.EMPTY_LIST);
+			}
 
 			System.out.println(">>>> ECJ: " + args);
 
@@ -320,10 +329,11 @@ public CompilerResult performCompile( CompilerConfiguration config )
 			List<CompilerMessage> messageList;
 			boolean hasError = false;
 			if(errorF.length() < 80) {
-				messageList = new ArrayList<>();
-				messageList.add(new CompilerMessage("Internal compiler error"));
-				System.err.println(">> " + sw.toString());
-				return new CompilerResult(false, messageList);
+				throw new IOException("Failed to run the ECJ compiler:\n" + sw.toString());
+				//messageList = new ArrayList<>();
+				//messageList.add(new CompilerMessage("Internal compiler error"));
+				//System.err.println(">> " + sw.toString());
+				//return new CompilerResult(false, messageList);
 			}
 			messageList = new EcjResponseParser().parse(errorF, errorsAsWarnings);
 

plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java

@@ -1,11 +1,11 @@
 package org.codehaus.plexus.compiler.eclipse;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 import org.codehaus.plexus.compiler.AbstractCompilerTest;
 import org.codehaus.plexus.compiler.CompilerConfiguration;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 public class EclipseCompilerErrorsAsWarningsTest extends AbstractCompilerTest
 {
 
@@ -39,9 +39,14 @@ protected int expectedWarnings()
 
     protected Collection<String> expectedOutputFiles()
     {
-        return Arrays.asList( new String[] { "org/codehaus/foo/Deprecation.class",
-            "org/codehaus/foo/ExternalDeps.class", "org/codehaus/foo/Person.class",
-            "org/codehaus/foo/ReservedWord.class", "org/codehaus/foo/Bad.class",
-            "org/codehaus/foo/UnknownSymbol.class", "org/codehaus/foo/RightClassname.class" } );
+        return Arrays.asList( new String[] {
+            "org/codehaus/foo/Deprecation.class",
+            "org/codehaus/foo/ExternalDeps.class",
+            "org/codehaus/foo/Person.class",
+            "org/codehaus/foo/ReservedWord.class",
+            //"org/codehaus/foo/Bad.class",             // This one has no class file generated as it's one big issue
+            //"org/codehaus/foo/UnknownSymbol.class",
+            //"org/codehaus/foo/RightClassname.class"
+        });
     }
 }