6 files changed, 83 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 78c2956..04cfc1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,10 @@ Makefile.in
 *.3
 *.5
 
+cert.pem
+openssl.cnf
+x509v3.cnf
+
 # tests
 test-driver
 *.log
@@ -60,12 +64,14 @@ tests/bn_rand_interval*
 tests/bn_to_string*
 tests/cipher*
 tests/constraints*
+tests/ec_point_conversion*
 tests/explicit_bzero*
 tests/freenull*
 tests/gost2814789t*
 tests/key_schedule*
 tests/mont*
 tests/rfc5280time*
+tests/ssl_get_shared_ciphers*
 tests/ssl_methods*
 tests/ssl_versions*
 tests/timingsafe*
diff --git a/.travis.yml b/.travis.yml
index 3e50e18..12e1d56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,3 +62,6 @@ matrix:
 
 script:
   "./scripts/travis"
+
+after_failure:
+  "./scripts/travis_failure"
diff --git a/scripts/travis_failure b/scripts/travis_failure
new file mode 100755
index 0000000..93354fd
--- /dev/null
+++ b/scripts/travis_failure
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+CWD=`pwd`
+
+testsdir=`ls -d libressl-*/_build/sub/tests`
+if [ -d "$testsdir" ] ; then
+        echo "##### test logs in $testsdir"
+        cd $testsdir
+        for i in `ls *.trs` ; do
+                grep ':test-result: PASS' $i > /dev/null
+                if [ $? -eq 1 ] ; then
+                        log=`echo $i | sed 's/\.trs$/\.log/'`
+                        echo "***** $log"
+                        cat $log
+                fi
+        done
+        cd $CWD
+fi
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d0280f7..52acbba 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -132,10 +132,9 @@ if(NOT BUILD_SHARED_LIBS)
 endif()
 
 # clienttest
-# disabled
-#add_executable(clienttest clienttest.c)
-#target_link_libraries(clienttest ${OPENSSL_LIBS})
-#add_test(clienttest clienttest)
+add_executable(clienttest clienttest.c)
+target_link_libraries(clienttest ${OPENSSL_LIBS})
+add_test(clienttest clienttest)
 
 # cmstest
 add_executable(cmstest cmstest.c)
@@ -174,6 +173,14 @@ add_executable(dsatest dsatest.c)
 target_link_libraries(dsatest ${OPENSSL_LIBS})
 add_test(dsatest dsatest)
 
+# dtlstest
+if(NOT WIN32)
+        add_executable(dtlstest dtlstest.c)
+        target_link_libraries(dtlstest ${OPENSSL_LIBS})
+        add_test(NAME dtlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/dtlstest.sh)
+        set_tests_properties(dtlstest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
+endif()
+
 if(NOT BUILD_SHARED_LIBS)
 # ec_point_conversion
 add_executable(ec_point_conversion ec_point_conversion.c)
@@ -439,6 +446,13 @@ add_executable(sm4test sm4test.c)
 target_link_libraries(sm4test ${OPENSSL_LIBS})
 add_test(sm4test sm4test)
 
+# ssl_get_shared_ciphers
+add_executable(ssl_get_shared_ciphers ssl_get_shared_ciphers.c)
+set_source_files_properties(ssl_get_shared_ciphers.c PROPERTIES COMPILE_FLAGS
+        -DCERTSDIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\")
+target_link_libraries(ssl_get_shared_ciphers ${OPENSSL_LIBS})
+add_test(ssl_get_shared_ciphers ssl_get_shared_ciphers)
+
 # ssl_versions
 if(NOT BUILD_SHARED_LIBS)
         add_executable(ssl_versions ssl_versions.c)
@@ -492,6 +506,11 @@ if(NOT BUILD_SHARED_LIBS)
         add_test(tlsexttest tlsexttest)
 endif()
 
+# tlslegacytest
+add_executable(tlslegacytest tlslegacytest.c)
+target_link_libraries(tlslegacytest ${OPENSSL_LIBS})
+add_test(tlslegacytest tlslegacytest)
+
 # tlstest
 set(TLSTEST_SRC tlstest.c)
 check_function_exists(pipe2 HAVE_PIPE2)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 678027e..8ce338f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -132,10 +132,9 @@ check_PROGRAMS += cipherstest
 cipherstest_SOURCES = cipherstest.c
 
 # clienttest
-# disabled
-#TESTS += clienttest
-#check_PROGRAMS += clienttest
-#clienttest_SOURCES = clienttest.c
+TESTS += clienttest
+check_PROGRAMS += clienttest
+clienttest_SOURCES = clienttest.c
 
 # cmstest
 TESTS += cmstest
@@ -172,6 +171,12 @@ TESTS += dsatest
 check_PROGRAMS += dsatest
 dsatest_SOURCES = dsatest.c
 
+# dtlstest
+TESTS += dtlstest.sh
+check_PROGRAMS += dtlstest
+dtlstest_SOURCES = dtlstest.c
+EXTRA_DIST += dtlstest.sh
+
 # ec_point_conversion
 TESTS += ec_point_conversion
 check_PROGRAMS += ec_point_conversion
@@ -410,6 +415,12 @@ TESTS += sm4test
 check_PROGRAMS += sm4test
 sm4test_SOURCES = sm4test.c
 
+# ssl_get_shared_ciphers
+TESTS += ssl_get_shared_ciphers
+ssl_get_shared_ciphers_CPPFLAGS = $(AM_CPPFLAGS) -DCERTSDIR=\"$(srcdir)\"
+check_PROGRAMS += ssl_get_shared_ciphers
+ssl_get_shared_ciphers_SOURCES = ssl_get_shared_ciphers.c
+
 # ssl_methods
 TESTS += ssl_methods
 check_PROGRAMS += ssl_methods
@@ -450,6 +461,11 @@ TESTS += tlsexttest
 check_PROGRAMS += tlsexttest
 tlsexttest_SOURCES = tlsexttest.c
 
+# tlslegacytest
+TESTS += tlslegacytest
+check_PROGRAMS += tlslegacytest
+tlslegacytest_SOURCES = tlslegacytest.c
+
 # tlstest
 TESTS += tlstest.sh
 check_PROGRAMS += tlstest
diff --git a/tests/dtlstest.sh b/tests/dtlstest.sh
new file mode 100755
index 0000000..ef18cfc
--- /dev/null
+++ b/tests/dtlstest.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+dtlstest_bin=./dtlstest
+if [ -e ./dtlstest.exe ]; then
+        dtlstest_bin=./dtlstest.exe
+fi
+
+if [ -z $srcdir ]; then
+        srcdir=.
+fi
+
+$dtlstest_bin $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem