Land #669, add new tests

author: Brent Cook <busterb@gmail.com> 2021-05-21 02:35:20 -0500
committer: Brent Cook <busterb@gmail.com> 2021-05-21 02:35:20 -0500
commit: 31dc716df31fea5412f3bdb53caab09dec0c2050 (patch)
tree: 74ab77e73ffba3df2888705dcf7672fe016e034f
parent: be44d2a83a62bd1a54d13de94a4a3c4465b4a72c (diff)
parent: dcad94bbc08718774608360ce160e4593bd2fa56 (diff)
download: portable-31dc716df31fea5412f3bdb53caab09dec0c2050.tar.gz
portable-31dc716df31fea5412f3bdb53caab09dec0c2050.tar.bz2
portable-31dc716df31fea5412f3bdb53caab09dec0c2050.zip
5 files changed, 48 insertions, 0 deletions
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 586f9d3..52acbba 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -173,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)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9fac550..8ce338f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -171,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
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
author	Brent Cook <busterb@gmail.com>	2021-05-21 02:35:20 -0500
committer	Brent Cook <busterb@gmail.com>	2021-05-21 02:35:20 -0500
commit	31dc716df31fea5412f3bdb53caab09dec0c2050 (patch)
tree	74ab77e73ffba3df2888705dcf7672fe016e034f
parent	be44d2a83a62bd1a54d13de94a4a3c4465b4a72c (diff)
parent	dcad94bbc08718774608360ce160e4593bd2fa56 (diff)
download	portable-31dc716df31fea5412f3bdb53caab09dec0c2050.tar.gz portable-31dc716df31fea5412f3bdb53caab09dec0c2050.tar.bz2 portable-31dc716df31fea5412f3bdb53caab09dec0c2050.zip

diff --git a/.travis.yml b/.travis.yml index 3e50e18..12e1d56 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -62,3 +62,6 @@ matrix:
62		62
63	script:	63	script:
64	"./scripts/travis"	64	"./scripts/travis"
		65
		66	after_failure:
		67	"./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 @@
		1	#!/bin/sh
		2
		3	CWD=`pwd`
		4
		5	testsdir=`ls -d libressl-*/_build/sub/tests`
		6	if [ -d "$testsdir" ] ; then
		7	echo "##### test logs in $testsdir"
		8	cd $testsdir
		9	for i in `ls *.trs` ; do
		10	grep ':test-result: PASS' $i > /dev/null
		11	if [ $? -eq 1 ] ; then
		12	log=`echo $i \| sed 's/\.trs$/\.log/'`
		13	echo "***** $log"
		14	cat $log
		15	fi
		16	done
		17	cd $CWD
		18	fi


diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 586f9d3..52acbba 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt
@@ -173,6 +173,14 @@ add_executable(dsatest dsatest.c)
173	target_link_libraries(dsatest ${OPENSSL_LIBS})	173	target_link_libraries(dsatest ${OPENSSL_LIBS})
174	add_test(dsatest dsatest)	174	add_test(dsatest dsatest)
175		175
		176	# dtlstest
		177	if(NOT WIN32)
		178	add_executable(dtlstest dtlstest.c)
		179	target_link_libraries(dtlstest ${OPENSSL_LIBS})
		180	add_test(NAME dtlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/dtlstest.sh)
		181	set_tests_properties(dtlstest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
		182	endif()
		183
176	if(NOT BUILD_SHARED_LIBS)	184	if(NOT BUILD_SHARED_LIBS)
177	# ec_point_conversion	185	# ec_point_conversion
178	add_executable(ec_point_conversion ec_point_conversion.c)	186	add_executable(ec_point_conversion ec_point_conversion.c)


diff --git a/tests/Makefile.am b/tests/Makefile.am index 9fac550..8ce338f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am
@@ -171,6 +171,12 @@ TESTS += dsatest
171	check_PROGRAMS += dsatest	171	check_PROGRAMS += dsatest
172	dsatest_SOURCES = dsatest.c	172	dsatest_SOURCES = dsatest.c
173		173
		174	# dtlstest
		175	TESTS += dtlstest.sh
		176	check_PROGRAMS += dtlstest
		177	dtlstest_SOURCES = dtlstest.c
		178	EXTRA_DIST += dtlstest.sh
		179
174	# ec_point_conversion	180	# ec_point_conversion
175	TESTS += ec_point_conversion	181	TESTS += ec_point_conversion
176	check_PROGRAMS += ec_point_conversion	182	check_PROGRAMS += ec_point_conversion


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 @@
		1	#!/bin/sh
		2	set -e
		3
		4	dtlstest_bin=./dtlstest
		5	if [ -e ./dtlstest.exe ]; then
		6	dtlstest_bin=./dtlstest.exe
		7	fi
		8
		9	if [ -z $srcdir ]; then
		10	srcdir=.
		11	fi
		12
		13	$dtlstest_bin $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem