namemap: change ossl_namemap_empty() to do what the documentation says.

[oweals/openssl.git] / test / testutil / main.c

diff --git a/test/testutil/main.c b/test/testutil/main.c
index 435a3585ce31e2d329f32d0c9f09cc903484e532..6716750a30535f6962403b3830c6e88f79376979 100644 (file)
--- a/test/testutil/main.c
+++ b/test/testutil/main.c
@@ -1,20 +1,40 @@
 /*
- * 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
  */
 
 #include "../testutil.h"
+#include "output.h"
+#include "tu_local.h"
+
 
 int main(int argc, char *argv[])
 {
-    int ret;
-    setup_test();
+    int ret = EXIT_FAILURE;
+
+    test_open_streams();
+
+    if (!global_init()) {
+        test_printf_stderr("Global init failed - aborting\n");
+        return ret;
+    }
 
-    ret = test_main(argc, argv);
+    if (!setup_test_framework(argc, argv))
+        goto end;
 
-    return finish_test(ret);
+    if (setup_tests()) {
+        ret = run_tests(argv[0]);
+        cleanup_tests();
+        opt_check_usage();
+    } else {
+        opt_help(test_get_options());
+    }
+end:
+    ret = pulldown_test_framework(ret);
+    test_close_streams();
+    return ret;
 }