make it clear that we skipped 64-bit time_t tests

4 files changed, 26 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 83f8f0b..d0d0ef3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,13 +49,14 @@ Makefile.in
 test-driver
 *.log
 *.trs
-!tests/optionstest.c
 tests/aes_wrap*
 tests/arc4random_fork*
+tests/asn1time*
 tests/cipher*
 tests/explicit_bzero*
 tests/gost2814789t*
 tests/mont*
+tests/rfc5280time*
 tests/timingsafe*
 tests/*test
 tests/tests.h
@@ -65,6 +66,8 @@ tests/pbkdf2*
 tests/*.pem
 tests/testssl
 tests/*.txt
+!tests/optionstest.c
+!tests/*.test
 
 # ctags stuff
 TAGS
@@ -94,6 +97,7 @@ ltmain.sh
 missing
 stamp-h1
 stamp-h2
+tap-driver.sh
 
 include/openssl/Makefile.am
 
@@ -111,18 +115,18 @@ include/pqueue.h
 include/tls.h
 include/openssl/*.h
 
-!/apps/nc/readpassphrase.c
 /apps/nc/*.h
 /apps/nc/*.c
 /apps/nc/nc*
-!/apps/openssl/apps_win.c
-!/apps/openssl/certhash_win.c
+!/apps/nc/readpassphrase.c
 /apps/openssl/*.h
 /apps/openssl/*.c
 /apps/openssl/*.cnf
 /apps/openssl/*.pem
 /apps/openssl/openssl
 /apps/openssl/compat/strtonum.c
+!/apps/openssl/apps_win.c
+!/apps/openssl/certhash_win.c
 
 !/crypto/Makefile.am.*
 !/crypto/compat/arc4random.h
diff --git a/configure.ac b/configure.ac
index 148ca64..f15e746 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,4 +141,6 @@ if test "$ac_cv_sizeof_time_t" = "4"; then
     echo " ** It will behave incorrectly when handling valid RFC5280 dates"
 fi
 
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
+
 AC_OUTPUT
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6bf3118..a01b771 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,6 +11,8 @@ LDADD += $(top_builddir)/ssl/libssl.la
 LDADD += $(top_builddir)/crypto/libcrypto.la
 LDADD += $(top_builddir)/tls/libtls.la
 
+TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh
+
 TESTS =
 check_PROGRAMS =
 EXTRA_DIST = CMakeLists.txt
@@ -259,15 +261,14 @@ check_PROGRAMS += rc4test
 rc4test_SOURCES = rc4test.c
 
 # rfc5280time
+check_PROGRAMS += rfc5280time
+rfc5280time_SOURCES = rfc5280time.c
 if SMALL_TIME_T
-TESTS += rfc5280time_too_small
-check_PROGRAMS += rfc5280time_too_small
-rfc5280time_too_small_SOURCES = rfc5280time.c
+TESTS += rfc5280time.test
 else
 TESTS += rfc5280time
-check_PROGRAMS += rfc5280time
-rfc5280time_SOURCES = rfc5280time.c
 endif
+EXTRA_DIST += rfc5280time.test
 
 # rmdtest
 TESTS += rmdtest
diff --git a/tests/rfc5280time.test b/tests/rfc5280time.test
new file mode 100755
index 0000000..3730597
--- /dev/null
+++ b/tests/rfc5280time.test
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+echo 1..2
+TEST=./rfc5280time
+if [ -e ./rfc5280time.exe ]; then
+        TEST=./rfc5280time.exe
+fi
+$TEST
+echo "ok 1"
+echo "ok 2 - rfc5280time_64-bit # SKIP this system is unable to represent times past 2038"