Merge pull request #99 from testmycode/valgrind-fix-and-release

Valgrind fix and release

Author: mpartel

tmc-plugin/manifest.mf

@@ -6,4 +6,4 @@ OpenIDE-Module-Requires:
   org.openide.windows.IOProvider,
   org.openide.windows.WindowManager
 OpenIDE-Module-Install: fi/helsinki/cs/tmc/actions/TmcModuleInstall.class
-OpenIDE-Module-Specification-Version: 0.8.6
+OpenIDE-Module-Specification-Version: 0.8.7

tmc-plugin/src/fi/helsinki/cs/tmc/data/serialization/cresultparser/CTestResultParser.java

@@ -136,11 +136,12 @@ private void addValgrindOutput() throws FileNotFoundException {
             outputs[i] = "";
         }
 
-        Pattern errorPattern = Pattern.compile("ERROR SUMMARY: ([0-9]+)");
+        Pattern errorPattern = Pattern.compile("==[0-9]+== ERROR SUMMARY: ([0-9]+)");
 
         String line = scanner.nextLine();
         int firstPID = parsePID(line);
         parentOutput += "\n" + line;
+        boolean warningLogged = false;
         while (scanner.hasNextLine()) {
             line = scanner.nextLine();
             int pid = parsePID(line);
@@ -150,10 +151,18 @@ private void addValgrindOutput() throws FileNotFoundException {
             if (pid == firstPID) {
                 parentOutput += "\n" + line;
             } else {
-                outputs[findIndex(pid, pids)] += "\n" + line;
+                int outputIndex = findIndex(pid, pids);
+                if (outputIndex == -1) {
+                    if (!warningLogged) {
+                        log.warning("Valgrind output has more PIDs than the expected (# of test cases + 1).");
+                        warningLogged = true;
+                    }
+                    continue;
+                }
+                outputs[outputIndex] += "\n" + line;
                 Matcher m = errorPattern.matcher(line);
                 if (m.find()) {
-                    errors[findIndex(pid, pids)] = Integer.parseInt(m.group(1));
+                    errors[outputIndex] = Integer.parseInt(m.group(1));
                 }
             }
         }
@@ -162,7 +171,7 @@ private void addValgrindOutput() throws FileNotFoundException {
         for (int i = 0; i < outputs.length; i++) {
             if (errors[i] == 0) {
                 // Workaround for a bug where any valgrind output is considered a potential error.
-                outputs[i] = "";
+                outputs[i] = null;
             }
             tests.get(i).setValgrindTrace(outputs[i]);
         }
@@ -178,7 +187,7 @@ private int findIndex(int pid, int[] pids) {
                 return i;
             }
         }
-        return 0;
+        return -1;
     }
 
     private int parsePID(String line) {

tmc-plugin/test/unit/src/fi/helsinki/cs/tmc/data/serialization/cresultparser/CTestResultParserTest.java

@@ -129,7 +129,7 @@ public void testParsingWithValgrindOutput() {
         CTestResultParser cpar = null;
         try {
             File ttmp = constructTestOutput(oneOfEachTest);
-            File vtmp = constructNotMemoryFailingValgrindOutput(oneOfEachTest);
+            File vtmp = constructMemoryFailingValgrindOutput();
 
             cpar = new CTestResultParser(ttmp, vtmp, null);
             cpar.parseTestOutput();
@@ -140,11 +140,12 @@ public void testParsingWithValgrindOutput() {
         }
         List<TestCaseResult> results = cpar.getTestCaseResults();
         assertEquals("There should be two test results", 2, results.size());
-        int i = 2;
-        for (TestCaseResult r : results) {
-            assertEquals("==" + i * 2 + "== " + (i - 1), r.getDetailedMessage().split("\n")[1]);
-            i++;
-        }
+        assertNotNull("Valgrind errors should go in detailed message",
+                results.get(0).getDetailedMessage());
+        assertTrue("Valgrind errors should go in detailed message",
+                results.get(0).getDetailedMessage().contains("==1== 1"));
+        assertNull("Valgrind output should go into detailed message if there were not errors",
+                results.get(1).getDetailedMessage());
     }
 
     @Test
@@ -163,10 +164,9 @@ public void testTestsPassWhenNoMemoryErrors() {
         }
         List<TestCaseResult> results = cpar.getTestCaseResults();
         assertEquals("There should be two test results", 2, results.size());
-        int i = 2;
         for (TestCaseResult r : results) {
-            assertEquals("==" + i * 2 + "== " + (i - 1), r.getDetailedMessage().split("\n")[1]);
-            i++;
+            assertNull("Valgrind output should be empty when there was no error",
+                    r.getDetailedMessage());
         }
     }