changeset 55:c4ebc9b5ea9d

TEST_ERROR -> TIMEOUT_ERROR.
author shade
date Thu, 03 Oct 2013 14:56:19 +0400
parents ba3be59cfe06
children 49d5be2f6189
files harness/src/main/java/org/openjdk/jcstress/infra/Status.java harness/src/main/java/org/openjdk/jcstress/infra/grading/ConsoleReportPrinter.java harness/src/main/java/org/openjdk/jcstress/infra/grading/ExceptionReportPrinter.java harness/src/main/java/org/openjdk/jcstress/infra/grading/HTMLReportPrinter.java harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor1_Runner.java harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor2_Arbiter1_Runner.java harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor2_Runner.java harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor3_Runner.java harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor4_Runner.java
diffstat 9 files changed, 15 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/harness/src/main/java/org/openjdk/jcstress/infra/Status.java	Thu Oct 03 14:41:42 2013 +0400
+++ b/harness/src/main/java/org/openjdk/jcstress/infra/Status.java	Thu Oct 03 14:56:19 2013 +0400
@@ -34,7 +34,7 @@
     NORMAL(0),
     API_MISMATCH(1),
     CHECK_TEST_ERROR(2),
-    TEST_ERROR(3),
+    TIMEOUT_ERROR(3),
     VM_ERROR(4);
 
     private int severity;
--- a/harness/src/main/java/org/openjdk/jcstress/infra/grading/ConsoleReportPrinter.java	Thu Oct 03 14:41:42 2013 +0400
+++ b/harness/src/main/java/org/openjdk/jcstress/infra/grading/ConsoleReportPrinter.java	Thu Oct 03 14:56:19 2013 +0400
@@ -114,9 +114,9 @@
 
     private void parseSummary(PrintWriter output, TestResult r) {
         switch (r.status()) {
-            case TEST_ERROR:
+            case TIMEOUT_ERROR:
                 output.println();
-                printLine(output, "ERROR", r);
+                printLine(output, "TIMEOUT", r);
                 parseVerbose(output, r);
                 output.println();
                 return;
--- a/harness/src/main/java/org/openjdk/jcstress/infra/grading/ExceptionReportPrinter.java	Thu Oct 03 14:41:42 2013 +0400
+++ b/harness/src/main/java/org/openjdk/jcstress/infra/grading/ExceptionReportPrinter.java	Thu Oct 03 14:56:19 2013 +0400
@@ -125,8 +125,8 @@
             case CHECK_TEST_ERROR:
                 failures.add(result.getName() + " had failed the pre-test.");
                 break;
-            case TEST_ERROR:
-                failures.add(result.getName() + " had failed the test.");
+            case TIMEOUT_ERROR:
+                failures.add(result.getName() + " had timed out.");
                 break;
             case VM_ERROR:
                 failures.add(result.getName() + " had failed with the VM error.");
--- a/harness/src/main/java/org/openjdk/jcstress/infra/grading/HTMLReportPrinter.java	Thu Oct 03 14:41:42 2013 +0400
+++ b/harness/src/main/java/org/openjdk/jcstress/infra/grading/HTMLReportPrinter.java	Thu Oct 03 14:56:19 2013 +0400
@@ -325,9 +325,12 @@
                     output.println("<td class=\"special\">Sanity check failed, API mismatch?</td>");
                     break;
                 case CHECK_TEST_ERROR:
-                case TEST_ERROR:
                     output.println("<td class=\"failed\">ERROR</td>");
-                    output.println("<td class=\"failed\">Error running the test</td>");
+                    output.println("<td class=\"failed\">Error while running the test</td>");
+                    break;
+                case TIMEOUT_ERROR:
+                    output.println("<td class=\"failed\">ERROR</td>");
+                    output.println("<td class=\"failed\">Timeout while running the test</td>");
                     break;
                 case VM_ERROR:
                     output.println("<td class=\"failed\">VM ERROR</td>");
--- a/harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor1_Runner.java	Thu Oct 03 14:41:42 2013 +0400
+++ b/harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor1_Runner.java	Thu Oct 03 14:56:19 2013 +0400
@@ -160,7 +160,7 @@
         controlHolder.isStopped = true;
 
         if (!waitFor(tasks)) {
-            dumpFailure(test, Status.TEST_ERROR);
+            dumpFailure(test, Status.TIMEOUT_ERROR);
         }
 
         return counter;
--- a/harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor2_Arbiter1_Runner.java	Thu Oct 03 14:41:42 2013 +0400
+++ b/harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor2_Arbiter1_Runner.java	Thu Oct 03 14:56:19 2013 +0400
@@ -174,7 +174,7 @@
         controlHolder.isStopped = true;
 
         if (!waitFor(tasks)) {
-            dumpFailure(test, Status.TEST_ERROR);
+            dumpFailure(test, Status.TIMEOUT_ERROR);
         }
 
         return counter;
--- a/harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor2_Runner.java	Thu Oct 03 14:41:42 2013 +0400
+++ b/harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor2_Runner.java	Thu Oct 03 14:56:19 2013 +0400
@@ -170,7 +170,7 @@
         controlHolder.isStopped = true;
 
         if (!waitFor(tasks)) {
-            dumpFailure(test, Status.TEST_ERROR);
+            dumpFailure(test, Status.TIMEOUT_ERROR);
         }
 
         return counter;
--- a/harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor3_Runner.java	Thu Oct 03 14:41:42 2013 +0400
+++ b/harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor3_Runner.java	Thu Oct 03 14:56:19 2013 +0400
@@ -181,7 +181,7 @@
         controlHolder.isStopped = true;
 
         if (!waitFor(tasks)) {
-            dumpFailure(test, Status.TEST_ERROR);
+            dumpFailure(test, Status.TIMEOUT_ERROR);
         }
 
         return counter;
--- a/harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor4_Runner.java	Thu Oct 03 14:41:42 2013 +0400
+++ b/harness/src/main/java/org/openjdk/jcstress/infra/runners/Actor4_Runner.java	Thu Oct 03 14:56:19 2013 +0400
@@ -192,7 +192,7 @@
         controlHolder.isStopped = true;
 
         if (!waitFor(tasks)) {
-            dumpFailure(test, Status.TEST_ERROR);
+            dumpFailure(test, Status.TIMEOUT_ERROR);
         }
 
         return counter;