Use "" not <> for internal/ includes

[openssl.git] / test / poly1305_internal_test.c

diff --git a/test/poly1305_internal_test.c b/test/poly1305_internal_test.c
index 03b0fa91dfb2a04823687048746daaac5305c33e..d1d71c92ee75f1b1a8d88117cd9fe1efdf8ca7d4 100644 (file)
--- a/test/poly1305_internal_test.c
+++ b/test/poly1305_internal_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -13,10 +13,9 @@
 #include <string.h>
 
 #include "testutil.h"
-#include "test_main_custom.h"
 #include "internal/poly1305.h"
 #include "../crypto/poly1305/poly1305_local.h"
-#include "e_os.h"
+#include "internal/nelem.h"
 
 typedef struct {
     size_t size;
@@ -1600,7 +1599,7 @@ static int test_poly1305(int idx)
             Poly1305_Final(&poly1305, out);
 
             if (!TEST_mem_eq(out, expectedlen, expected, expectedlen)) {
-                TEST_info("Poly1305 test #%d/%" OSSLzu "+%" OSSLzu " failed.",
+                TEST_info("Poly1305 test #%d/%zu+%zu failed.",
                           idx, half, inlen-half);
                 return 0;
             }
@@ -1610,31 +1609,20 @@ static int test_poly1305(int idx)
     return 1;
 }
 
-int test_main(int argc, char **argv)
+int setup_tests(void)
 {
-    int result = 0;
-    int iter_argv;
-    int benchmark = 0;
-
-    for (iter_argv = 1; iter_argv < argc; iter_argv++) {
-        if (strcmp(argv[iter_argv], "-b") == 0)
-            benchmark = 1;
-        else if (strcmp(argv[iter_argv], "-h") == 0)
-            goto help;
+    if (test_has_option("-h")) {
+        printf("-h\tThis help\n");
+        printf("-b\tBenchmark in addition to the tests\n");
+        return 1;
     }
 
     ADD_ALL_TESTS(test_poly1305, OSSL_NELEM(tests));
+    return 1;
+}
 
-    result = run_tests(argv[0]);
-
-    if (benchmark)
+void cleanup_tests(void)
+{
+    if (test_has_option("-b"))
         benchmark_poly1305();
-
-    return result;
-
- help:
-    printf("-h\tThis help\n");
-    printf("-b\tBenchmark in addition to the tests\n");
-
-    return 0;
 }