Following the license change, modify the boilerplates in test/

[openssl.git] / test / testutil / driver.c

diff --git a/test/testutil/driver.c b/test/testutil/driver.c
index dc236b7d6b94d4b163aeab326d985fefb6cb9837..95b40be3247402b7e64fd3c80123665a67f9b7bf 100644 (file)
--- a/test/testutil/driver.c
+++ b/test/testutil/driver.c
@@ -1,7 +1,7 @@
 /*
- * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
@@ -14,15 +14,19 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../../e_os.h"
+#include "internal/nelem.h"
 #include <openssl/bio.h>
 
+#ifdef _WIN32
+# define strdup _strdup
+#endif
+
 /*
  * Declares the structures needed to register each test case function.
  */
 typedef struct test_info {
     const char *test_case_name;
-    int (*test_fn) ();
+    int (*test_fn) (void);
     int (*param_test_fn)(int idx);
     int num;
 
@@ -40,7 +44,7 @@ static int seed = 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;
@@ -70,7 +74,7 @@ int subtest_level(void)
 }
 
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
-static int should_report_leaks()
+static int should_report_leaks(void)
 {
     /*
      * When compiled with enable-crypto-mdebug, OPENSSL_DEBUG_MEMORY=0
@@ -95,19 +99,17 @@ static int gcd(int a, int b)
     return a;
 }
 
-void setup_test()
+void setup_test_framework()
 {
     char *TAP_levels = getenv("HARNESS_OSSL_LEVEL");
     char *test_seed = getenv("OPENSSL_TEST_RAND_ORDER");
 
-    test_open_streams();
-
     level = TAP_levels != NULL ? 4 * atoi(TAP_levels) : 0;
 
     if (test_seed != NULL) {
         seed = atoi(test_seed);
         if (seed <= 0)
-            seed = time(NULL);
+            seed = (int)time(NULL);
         test_printf_stdout("%*s# RAND SEED %d\n", subtest_level(), "", seed);
         test_flush_stdout();
         srand(seed);
@@ -121,16 +123,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(openssl_error_cb, NULL) <= 0)
         return EXIT_FAILURE;
 #endif
 
-    test_close_streams();
-
     return ret;
 }
 
@@ -150,10 +151,28 @@ void set_test_title(const char *title)
     test_title = title == NULL ? NULL : strdup(title);
 }
 
+PRINTF_FORMAT(2, 3) static void test_verdict(int pass, const char *extra, ...)
+{
+    va_list 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 verdict = 1;
     int ii, i, jj, j, jstep;
     int permute[OSSL_NELEM(all_tests)];
 
@@ -185,18 +204,12 @@ int run_tests(const char *test_prog_name)
             set_test_title(all_tests[i].test_case_name);
             ret = all_tests[i].test_fn();
 
-            test_flush_stdout();
-            test_flush_stderr();
-
-            verdict = "ok";
+            verdict = 1;
             if (!ret) {
-                verdict = "not ok";
+                verdict = 0;
                 ++num_failed;
             }
-            test_printf_stdout("%*s%s %d - %s\n", level, "", verdict, ii + 1,
-                               test_title);
-            test_flush_stdout();
-            test_flush_stderr();
+            test_verdict(verdict, "%d - %s", ii + 1, test_title);
             finalize(ret);
         } else {
             int num_failed_inner = 0;
@@ -225,39 +238,33 @@ int run_tests(const char *test_prog_name)
                 set_test_title(NULL);
                 ret = all_tests[i].param_test_fn(j);
 
-                test_flush_stdout();
-                test_flush_stderr();
-
                 if (!ret)
                     ++num_failed_inner;
 
                 finalize(ret);
 
                 if (all_tests[i].subtest) {
-                    verdict = "ok";
+                    verdict = 1;
                     if (!ret) {
-                        verdict = "not ok";
+                        verdict = 0;
                         ++num_failed_inner;
                     }
                     if (test_title != NULL)
-                        test_printf_stdout("%*s%s %d - %s\n", level, "",
-                                           verdict, jj + 1, test_title);
+                        test_verdict(verdict, "%d - %s", jj + 1, test_title);
                     else
-                        test_printf_stdout("%*s%s %d - iteration %d\n", level,
-                                           "", verdict, jj + 1, j + 1);
-                    test_flush_stdout();
+                        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;
             }
-            test_printf_stdout("%*s%s %d - %s\n", level, "", verdict, ii + 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)
@@ -265,3 +272,28 @@ int run_tests(const char *test_prog_name)
     return EXIT_SUCCESS;
 }
 
+/*
+ * Glue an array of strings together and return it as an allocated string.
+ * Optionally return the whole length of this string in |out_len|
+ */
+char *glue_strings(const char *list[], size_t *out_len)
+{
+    size_t len = 0;
+    char *p, *ret;
+    int i;
+
+    for (i = 0; list[i] != NULL; i++)
+        len += strlen(list[i]);
+
+    if (out_len != NULL)
+        *out_len = len;
+
+    if (!TEST_ptr(ret = p = OPENSSL_malloc(len + 1)))
+        return NULL;
+
+    for (i = 0; list[i] != NULL; i++)
+        p += strlen(strcpy(p, list[i]));
+
+    return ret;
+}
+