Mercurial > octave

changeset 24483:dac2ad033c43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use same wording and order for individual test results and summary * __run_test_suite__.m, runtests.m: Use SKIP instead of SKIPPED and same order for printing number of failed and skipped tests.
author John W. Eaton <jwe@octave.org>
date Thu, 28 Dec 2017 10:17:01 -0500
parents b4e371b5f6b5
children abb075ada761
files scripts/testfun/__run_test_suite__.m scripts/testfun/runtests.m
diffstat 2 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/testfun/__run_test_suite__.m	Wed Dec 27 22:04:38 2017 -0800
+++ b/scripts/testfun/__run_test_suite__.m	Thu Dec 28 10:17:01 2017 -0500
@@ -86,23 +86,23 @@
       if (drgrs > 0)
         printf ("  %-30s %6d\n", "REGRESSION", drgrs);
       endif
-      if (dxf > 0)
-        printf ("  %-30s %6d\n", "XFAIL (expected failure)", dxf);
-      endif
       if (dxb > 0)
         printf ("  %-30s %6d\n", "XFAIL (reported bug)", dxb);
       endif
+      if (dxf > 0)
+        printf ("  %-30s %6d\n", "XFAIL (expected failure)", dxf);
+      endif
       if (dsk > 0)
-        printf ("  %-30s %6d\n", "SKIPPED (feature)", dsk);
+        printf ("  %-30s %6d\n", "SKIP (missing feature)", dsk);
       endif
       if (drtsk > 0)
-        printf ("  %-30s %6d\n", "SKIPPED (run-time condition)", drtsk);
+        printf ("  %-30s %6d\n", "SKIP (run-time condition)", drtsk);
       endif
       puts ("\n");
       printf ("See the file %s for additional details.\n", logfile);
       if (dxf > 0 || dxb > 0)
         puts ("\n");
-        puts ("XFAIL items are expected failures or known bugs.\n");
+        puts ("XFAIL items are known bugs or expected failures.\n");
         puts ("Bug report numbers may be found in the log file:\n");
         puts (logfile);
         puts ("\nPlease help improve Octave by contributing fixes for them.\n");
--- a/scripts/testfun/runtests.m	Wed Dec 27 22:04:38 2017 -0800
+++ b/scripts/testfun/runtests.m	Thu Dec 28 10:17:01 2017 -0500
@@ -149,18 +149,18 @@
     if (rgrs > 0)
       printf ("\n%71s %3d", "REGRESSION", rgrs);
     endif
-    if (sk > 0)
-      printf ("\n%71s %3d", "(missing feature) SKIP ", sk);
-    endif
-    if (rtsk > 0)
-      printf ("\n%71s %3d", "(run-time condition) SKIP ", rtsk);
-    endif
     if (xb > 0)
       printf ("\n%71s %3d", "(reported bug) XFAIL", xb);
     endif
     if (xf > 0)
       printf ("\n%71s %3d", "(expected failure) XFAIL", xf);
     endif
+    if (sk > 0)
+      printf ("\n%71s %3d", "(missing feature) SKIP", sk);
+    endif
+    if (rtsk > 0)
+      printf ("\n%71s %3d", "(run-time condition) SKIP", rtsk);
+    endif
   endif
   puts ("\n");