Index: Harness.java =================================================================== RCS file: /cvs/mauve/mauve/Harness.java,v retrieving revision 1.2 diff -u -r1.2 Harness.java --- Harness.java 24 Apr 2006 19:42:02 -0000 1.2 +++ Harness.java 25 Apr 2006 12:12:02 -0000 @@ -28,6 +28,7 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; import java.io.InputStreamReader; @@ -384,8 +385,8 @@ klass.getMethod ("compile", new Class[] { String.class, PrintWriter.class, PrintWriter.class }); - ecjWriterOut = new PrintWriter(".ecjOut"); - ecjWriterErr = new PrintWriter(".ecjErr"); + ecjWriterOut = new PrintWriter(new FileOutputStream(".ecjOut")); + ecjWriterErr = new PrintWriter(new FileOutputStream(".ecjErr")); // Set up the compiler options now that we know whether or not we are @@ -553,7 +554,7 @@ */ private static void initProcess(String[] args) { - StringBuilder sb = new StringBuilder(" RunnerProcess"); + StringBuffer sb = new StringBuffer(" RunnerProcess"); for (int i = 0; i < args.length; i++) sb.append(" " + args[i]); sb.insert(0, vmCommand); @@ -836,7 +837,7 @@ File dir = new File(folderName); String dirPath = dir.getPath(); File[] files = dir.listFiles(); - StringBuilder sb = new StringBuilder(); + StringBuffer sb = new StringBuffer(); String fullPath = null; boolean compilepassed = true; @@ -888,7 +889,7 @@ runFolder(sb, compilepassed); } - private static boolean compileFolder(StringBuilder sb, String folderName) + private static boolean compileFolder(StringBuffer sb, String folderName) { int result = - 1; int compileFailsInFolder = 0; @@ -1024,7 +1025,7 @@ * @param compilepassed true if the compilation step happened and all * tests passed or if compilation didn't happen (because of -nocompile). */ - private static void runFolder(StringBuilder sb, boolean compilepassed) + private static void runFolder(StringBuffer sb, boolean compilepassed) { StringTokenizer st = new StringTokenizer(sb.toString()); String nextTest = null; Index: RunnerProcess.java =================================================================== RCS file: /cvs/mauve/mauve/RunnerProcess.java,v retrieving revision 1.2 diff -u -r1.2 RunnerProcess.java --- RunnerProcess.java 24 Apr 2006 19:42:02 -0000 1.2 +++ RunnerProcess.java 25 Apr 2006 12:12:03 -0000 @@ -215,7 +215,7 @@ // we have to check through the file. while (firstLine != null) { - if (firstLine.contains("not-a-test")) + if (firstLine.indexOf("not-a-test") != -1) { description = NOT_A_TEST_DESCRIPTION; return; @@ -691,10 +691,10 @@ } // sb holds all the information we wish to return. - StringBuilder sb = - new StringBuilder(" " + (verbose ? "FAIL: " : "")+ "line " + lineOrigin - + ": " + (last_check == null ? "" : last_check) + - " [" + (count + 1) + "] -- uncaught exception:"); + StringBuffer sb = + new StringBuffer(" " + (verbose ? "FAIL: " : "")+ "line " + lineOrigin + + ": " + (last_check == null ? "" : last_check) + + " [" + (count + 1) + "] -- uncaught exception:"); // If a full stack trace will be printed, this method returns no details. if (exceptions)