Commit c0e3780b authored by Jonathan Shahen's avatar Jonathan Shahen

Print out the result even on Quiet

parent f400a777
package mohawk.testing;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
......@@ -82,14 +81,14 @@ public class TestingSuite {
ArrayList<NuSMVMode> modes = new ArrayList<NuSMVMode>();
switch (smvHelper.mode) {
case 3: // Both
case 3:// Both
modes.add(NuSMVMode.SMC);
modes.add(NuSMVMode.BMC);
break;
case 1: // BMC
case 1:// BMC
modes.add(NuSMVMode.BMC);
break;
case 2: // SMC
case 2:// SMC
modes.add(NuSMVMode.SMC);
break;
default:
......@@ -99,17 +98,17 @@ public class TestingSuite {
/* TIMING */timing.startTimer("smvHelper.loadSpecFiles");
smvHelper.loadSpecFiles();
/* TIMING */timing.stopTimer("smvHelper.loadSpecFiles");
/* TIMING */timing.startTimer("runTests.mainLoop");
ExecutorService executor = Executors.newSingleThreadExecutor();
Integer numSpecFiles = smvHelper.specFiles.size();
for (Integer i = 0; i < numSpecFiles; i++) {
/* TIMING */timing.startTimer("runTests.mainLoop (" + i + "/" + numSpecFiles + ")");
for (Integer j = 0; j < modes.size(); j++) {
String specFile = smvHelper.specFiles.get(i).getAbsolutePath();
String timerName = "runTests.mainLoop (" + i + "/" + numSpecFiles + ") - "
+ smvHelper.specFiles.get(i).getName() + " (" + modes.get(j) + ")";
String specFile = smvHelper.specFiles.get(i).getAbsolutePath();
String timerName = "runTests.mainLoop (" + i + "/" + numSpecFiles + ") - "
+ smvHelper.specFiles.get(i).getName() + " (" + modes.get(j) + ")";
/* TIMING */timing.startTimer(timerName);
logger.info("Working on " + timerName);
......@@ -163,7 +162,7 @@ public class TestingSuite {
} else {
lastResult = future.get(smvHelper.TIMEOUT_SECONDS, TimeUnit.SECONDS);
}
// System.out.println("Result: " + lastResult);
System.out.println("Result: " + lastResult);
logger.info("[COMPLETED] Result: " + lastResult + ", for the following spec file (in mode "
+ modes.get(j) + "): " + specFile);
......@@ -202,8 +201,6 @@ public class TestingSuite {
executor.shutdown();
/* TIMING */timing.stopTimer("runTests.mainLoop");
logger.exiting(getClass().getName(), "runTests()");
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment