X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Ftestutil%2Fdriver.c;h=274d3cde721a4eac69e01a5f2644bc64ba779d2b;hp=29c97a99120aeeff55d27dd4720a6ca0c3aab16f;hb=180c3fc7754f098b385c9a978491a2d468092bca;hpb=7531b3a6cd4b42bece94c0aab5b963fe03d1b139

diff --git a/test/testutil/driver.c b/test/testutil/driver.c
index 29c97a9912..274d3cde72 100644
--- a/test/testutil/driver.c
+++ b/test/testutil/driver.c
@@ -8,6 +8,8 @@
  */
 
 #include "../testutil.h"
+#include "output.h"
+#include "tu_local.h"
 
 #include <string.h>
 #include <assert.h>
@@ -30,6 +32,7 @@ typedef struct test_info {
 
 static TEST_INFO all_tests[1024];
 static int num_tests = 0;
+static int seed = 0;
 /*
  * A parameterised tests runs a loop of test cases.
  * |num_test_cases| counts the total number of test cases
@@ -37,7 +40,7 @@ static int num_tests = 0;
  */
 static int num_test_cases = 0;
 
-void add_test(const char *test_case_name, int (*test_fn) ())
+void add_test(const char *test_case_name, int (*test_fn) (void))
 {
     assert(num_tests != OSSL_NELEM(all_tests));
     all_tests[num_tests].test_case_name = test_case_name;
@@ -82,19 +85,32 @@ static int should_report_leaks()
 }
 #endif
 
-static int err_cb(const char *str, size_t len, void *u)
+static int gcd(int a, int b)
 {
-    return test_puts_stderr(str);
+    while (b != 0) {
+        int t = b;
+        b = a % b;
+        a = t;
+    }
+    return a;
 }
 
-void setup_test()
+void setup_test_framework()
 {
     char *TAP_levels = getenv("HARNESS_OSSL_LEVEL");
-
-    test_open_streams();
+    char *test_seed = getenv("OPENSSL_TEST_RAND_ORDER");
 
     level = TAP_levels != NULL ? 4 * atoi(TAP_levels) : 0;
 
+    if (test_seed != NULL) {
+        seed = atoi(test_seed);
+        if (seed <= 0)
+            seed = (int)time(NULL);
+        test_printf_stdout("%*s# RAND SEED %d\n", subtest_level(), "", seed);
+        test_flush_stdout();
+        srand(seed);
+    }
+
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
     if (should_report_leaks()) {
         CRYPTO_set_mem_debug(1);
@@ -103,15 +119,15 @@ void setup_test()
 #endif
 }
 
-int finish_test(int ret)
+int pulldown_test_framework(int ret)
 {
+    set_test_title(NULL);
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
-    if (should_report_leaks() && CRYPTO_mem_leaks_cb(err_cb, NULL) <= 0)
+    if (should_report_leaks()
+        && CRYPTO_mem_leaks_cb(openssl_error_cb, NULL) <= 0)
         return EXIT_FAILURE;
 #endif
 
-    test_close_streams();
-
     return ret;
 }
 
@@ -120,67 +136,103 @@ static void finalize(int success)
     if (success)
         ERR_clear_error();
     else
-        ERR_print_errors_cb(err_cb, NULL);
+        ERR_print_errors_cb(openssl_error_cb, NULL);
+}
+
+static char *test_title = NULL;
+
+void set_test_title(const char *title)
+{
+    free(test_title);
+    test_title = title == NULL ? NULL : strdup(title);
 }
 
-static void helper_printf_stdout(const char *fmt, ...)
+PRINTF_FORMAT(2, 3) static void test_verdict(int pass, const char *extra, ...)
 {
     va_list ap;
 
-    va_start(ap, fmt);
-    test_vprintf_stdout(fmt, ap);
-    va_end(ap);
+    test_flush_stdout();
+    test_flush_stderr();
+
+    test_printf_stdout("%*s%s", level, "", pass ? "ok" : "not ok");
+    if (extra != NULL) {
+        test_printf_stdout(" ");
+        va_start(ap, extra);
+        test_vprintf_stdout(extra, ap);
+        va_end(ap);
+    }
+    test_printf_stdout("\n");
+    test_flush_stdout();
 }
 
 int run_tests(const char *test_prog_name)
 {
     int num_failed = 0;
-    char *verdict = NULL;
-    int i, j;
-
-    if (num_tests < 1)
-        helper_printf_stdout("%*s1..0 # Skipped: %s\n", level, "",
-                             test_prog_name);
-    else if (level > 0)
-        helper_printf_stdout("%*s1..%d # Subtest: %s\n", level, "", num_tests,
-                             test_prog_name);
-    else
-        helper_printf_stdout("%*s1..%d\n", level, "", num_tests);
+    int verdict = 1;
+    int ii, i, jj, j, jstep;
+    int permute[OSSL_NELEM(all_tests)];
+
+    if (num_tests < 1) {
+        test_printf_stdout("%*s1..0 # Skipped: %s\n", level, "",
+                           test_prog_name);
+    } else {
+        if (level > 0)
+            test_printf_stdout("%*s# Subtest: %s\n", level, "", test_prog_name);
+        test_printf_stdout("%*s1..%d\n", level, "", num_tests);
+    }
     test_flush_stdout();
 
-    for (i = 0; i != num_tests; ++i) {
+    for (i = 0; i < num_tests; i++)
+        permute[i] = i;
+    if (seed != 0)
+        for (i = num_tests - 1; i >= 1; i--) {
+            j = rand() % (1 + i);
+            ii = permute[j];
+            permute[j] = permute[i];
+            permute[i] = ii;
+        }
+
+    for (ii = 0; ii != num_tests; ++ii) {
+        i = permute[ii];
         if (all_tests[i].num == -1) {
-            int ret = all_tests[i].test_fn();
+            int ret = 0;
 
-            test_flush_stdout();
-            test_flush_stderr();
+            set_test_title(all_tests[i].test_case_name);
+            ret = all_tests[i].test_fn();
 
-            verdict = "ok";
+            verdict = 1;
             if (!ret) {
-                verdict = "not ok";
+                verdict = 0;
                 ++num_failed;
             }
-            helper_printf_stdout("%*s%s %d - %s\n", level, "", verdict, i + 1,
-                                     all_tests[i].test_case_name);
-            test_flush_stdout();
+            test_verdict(verdict, "%d - %s", ii + 1, test_title);
             finalize(ret);
         } else {
             int num_failed_inner = 0;
 
             level += 4;
             if (all_tests[i].subtest) {
-                helper_printf_stdout("%*s# Subtest: %s\n", level, "",
-                                     all_tests[i].test_case_name);
-                helper_printf_stdout("%*s%d..%d\n", level, "", 1,
-                                     all_tests[i].num);
+                test_printf_stdout("%*s# Subtest: %s\n", level, "",
+                                   all_tests[i].test_case_name);
+                test_printf_stdout("%*s%d..%d\n", level, "", 1,
+                                   all_tests[i].num);
                 test_flush_stdout();
             }
 
-            for (j = 0; j < all_tests[i].num; j++) {
-                int ret = all_tests[i].param_test_fn(j);
+            j = -1;
+            if (seed == 0 || all_tests[i].num < 3)
+                jstep = 1;
+            else
+                do
+                    jstep = rand() % all_tests[i].num;
+                while (jstep == 0 || gcd(all_tests[i].num, jstep) != 1);
 
-                test_flush_stdout();
-                test_flush_stderr();
+            for (jj = 0; jj < all_tests[i].num; jj++) {
+                int ret;
+
+                j = (j + jstep) % all_tests[i].num;
+                set_test_title(NULL);
+                ret = all_tests[i].param_test_fn(j);
 
                 if (!ret)
                     ++num_failed_inner;
@@ -188,25 +240,27 @@ int run_tests(const char *test_prog_name)
                 finalize(ret);
 
                 if (all_tests[i].subtest) {
-                    verdict = "ok";
+                    verdict = 1;
                     if (!ret) {
-                        verdict = "not ok";
+                        verdict = 0;
                         ++num_failed_inner;
                     }
-                    helper_printf_stdout("%*s%s %d\n", level, "", verdict, j + 1);
-                    test_flush_stdout();
+                    if (test_title != NULL)
+                        test_verdict(verdict, "%d - %s", jj + 1, test_title);
+                    else
+                        test_verdict(verdict, "%d - iteration %d",
+                                     jj + 1, j + 1);
                 }
             }
 
             level -= 4;
-            verdict = "ok";
+            verdict = 1;
             if (num_failed_inner) {
-                verdict = "not ok";
+                verdict = 0;
                 ++num_failed;
             }
-            helper_printf_stdout("%*s%s %d - %s\n", level, "", verdict, i + 1,
-                                 all_tests[i].test_case_name);
-            test_flush_stdout();
+            test_verdict(verdict, "%d - %s", ii + 1,
+                         all_tests[i].test_case_name);
         }
     }
     if (num_failed != 0)