Fix no-tls1_2

[openssl.git] / test / test_test.c

diff --git a/test/test_test.c b/test/test_test.c
index 051058fffe1cab27561b0e560005dbd91c222a1b..0af2eaeb8ad58a640c4b635d0348e552f36370ba 100644 (file)
--- a/test/test_test.c
+++ b/test/test_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2017, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -16,7 +16,7 @@
 #include <openssl/crypto.h>
 #include <openssl/bn.h>
 
-#include "e_os.h"
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #define TEST(expected, test) test_case((expected), #test, (test))
@@ -170,20 +170,43 @@ err:
 
 static int test_size_t(void)
 {
-    if (!TEST(1, TEST_int_eq((size_t)10, (size_t)10))
-        | !TEST(0, TEST_int_eq((size_t)10, (size_t)12))
-        | !TEST(1, TEST_int_ne((size_t)10, (size_t)12))
-        | !TEST(0, TEST_int_ne((size_t)24, (size_t)24))
-        | !TEST(1, TEST_int_lt((size_t)30, (size_t)88))
-        | !TEST(0, TEST_int_lt((size_t)88, (size_t)30))
-        | !TEST(1, TEST_int_le((size_t)30, (size_t)88))
-        | !TEST(1, TEST_int_le((size_t)33, (size_t)33))
-        | !TEST(0, TEST_int_le((size_t)88, (size_t)30))
-        | !TEST(1, TEST_int_gt((size_t)52, (size_t)33))
-        | !TEST(0, TEST_int_gt((size_t)33, (size_t)52))
-        | !TEST(1, TEST_int_ge((size_t)52, (size_t)33))
-        | !TEST(1, TEST_int_ge((size_t)38, (size_t)38))
-        | !TEST(0, TEST_int_ge((size_t)33, (size_t)52)))
+    if (!TEST(1, TEST_size_t_eq((size_t)10, (size_t)10))
+        | !TEST(0, TEST_size_t_eq((size_t)10, (size_t)12))
+        | !TEST(1, TEST_size_t_ne((size_t)10, (size_t)12))
+        | !TEST(0, TEST_size_t_ne((size_t)24, (size_t)24))
+        | !TEST(1, TEST_size_t_lt((size_t)30, (size_t)88))
+        | !TEST(0, TEST_size_t_lt((size_t)88, (size_t)30))
+        | !TEST(1, TEST_size_t_le((size_t)30, (size_t)88))
+        | !TEST(1, TEST_size_t_le((size_t)33, (size_t)33))
+        | !TEST(0, TEST_size_t_le((size_t)88, (size_t)30))
+        | !TEST(1, TEST_size_t_gt((size_t)52, (size_t)33))
+        | !TEST(0, TEST_size_t_gt((size_t)33, (size_t)52))
+        | !TEST(1, TEST_size_t_ge((size_t)52, (size_t)33))
+        | !TEST(1, TEST_size_t_ge((size_t)38, (size_t)38))
+        | !TEST(0, TEST_size_t_ge((size_t)33, (size_t)52)))
+        goto err;
+    return 1;
+
+err:
+    return 0;
+}
+
+static int test_time_t(void)
+{
+    if (!TEST(1, TEST_time_t_eq((time_t)10, (time_t)10))
+        | !TEST(0, TEST_time_t_eq((time_t)10, (time_t)12))
+        | !TEST(1, TEST_time_t_ne((time_t)10, (time_t)12))
+        | !TEST(0, TEST_time_t_ne((time_t)24, (time_t)24))
+        | !TEST(1, TEST_time_t_lt((time_t)30, (time_t)88))
+        | !TEST(0, TEST_time_t_lt((time_t)88, (time_t)30))
+        | !TEST(1, TEST_time_t_le((time_t)30, (time_t)88))
+        | !TEST(1, TEST_time_t_le((time_t)33, (time_t)33))
+        | !TEST(0, TEST_time_t_le((time_t)88, (time_t)30))
+        | !TEST(1, TEST_time_t_gt((time_t)52, (time_t)33))
+        | !TEST(0, TEST_time_t_gt((time_t)33, (time_t)52))
+        | !TEST(1, TEST_time_t_ge((time_t)52, (time_t)33))
+        | !TEST(1, TEST_time_t_ge((time_t)38, (time_t)38))
+        | !TEST(0, TEST_time_t_ge((time_t)33, (time_t)52)))
         goto err;
     return 1;
 
@@ -508,8 +531,7 @@ static int test_bn_output(int n)
     return 1;
 }
 
-
-void register_tests(void)
+int setup_tests(void)
 {
     ADD_TEST(test_int);
     ADD_TEST(test_uint);
@@ -518,6 +540,7 @@ void register_tests(void)
     ADD_TEST(test_long);
     ADD_TEST(test_ulong);
     ADD_TEST(test_size_t);
+    ADD_TEST(test_time_t);
     ADD_TEST(test_pointer);
     ADD_TEST(test_bool);
     ADD_TEST(test_string);
@@ -530,4 +553,5 @@ void register_tests(void)
     ADD_TEST(test_single_eval);
     ADD_TEST(test_output);
     ADD_ALL_TESTS(test_bn_output, OSSL_NELEM(bn_output_tests));
+    return 1;
 }