commit 2fae041d6c507315a619e2f29bff86e44cc1d0a1
author Pauli <paul.dale@oracle.com> Wed Mar 22 14:27:55 2017 +1000
committer Pauli <paul.dale@oracle.com> Wed Mar 29 08:51:43 2017 +1000
tree 916c82cafe8b198da5ca777b29ea4fab3f036f5b
parent a6ac1ed686346d2164c16446624c973e51d3ae92

Test infrastructure additions.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3011)

test/x509_time_test.c

diff --git a/test/x509_time_test.c b/test/x509_time_test.c
index 5f69ebd..d9a7f50 100644
--- a/test/x509_time_test.c
+++ b/test/x509_time_test.c
@@ -156,8 +156,8 @@
     t.length = strlen(x509_cmp_tests[idx].data);
 
     result = X509_cmp_time(&t, &x509_cmp_tests[idx].cmp_time);
-    if (result != x509_cmp_tests[idx].expected) {
-        fprintf(stderr, "test_x509_cmp_time(%d) failed: expected %d, got %d\n",
+    if (!TEST_int_eq(result, x509_cmp_tests[idx].expected)) {
+        TEST_info("test_x509_cmp_time(%d) failed: expected %d, got %d\n",
                 idx, x509_cmp_tests[idx].expected, result);
         return 0;
     }
@@ -175,18 +175,12 @@
     asn1_after = ASN1_TIME_adj(NULL, now, 1, 0);
 
     cmp_result  = X509_cmp_time(asn1_before, NULL);
-    if (cmp_result != -1) {
-        fprintf(stderr, "test_x509_cmp_time_current failed: expected -1, got %d\n",
-                cmp_result);
+    if (!TEST_int_eq(cmp_result, -1))
         failed = 1;
-    }
 
     cmp_result = X509_cmp_time(asn1_after, NULL);
-    if (cmp_result != 1) {
-        fprintf(stderr, "test_x509_cmp_time_current failed: expected 1, got %d\n",
-                cmp_result);
+    if (!TEST_int_eq(cmp_result, 1))
         failed = 1;
-    }
 
     ASN1_TIME_free(asn1_before);
     ASN1_TIME_free(asn1_after);