aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-09-12 05:18:47 -0500
committerBrent Cook <bcook@openbsd.org>2015-09-12 05:18:47 -0500
commit34bfb6ecb5d178ee62b402ee344d0f6caf5cdad0 (patch)
tree36666ad8a0ebb48c6573e16218eac735f12f5b11
parentc84250a4e433228af3d9199cd94f62271584ec80 (diff)
downloadportable-34bfb6ecb5d178ee62b402ee344d0f6caf5cdad0.tar.gz
portable-34bfb6ecb5d178ee62b402ee344d0f6caf5cdad0.tar.bz2
portable-34bfb6ecb5d178ee62b402ee344d0f6caf5cdad0.zip
add new tests
-rw-r--r--tests/Makefile.am10
-rwxr-xr-xupdate.sh6
2 files changed, 16 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cd7c59e..fe3bece 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS += -I $(top_srcdir)/apps
8LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) 8LDADD = $(PLATFORM_LDADD) $(PROG_LDADD)
9LDADD += $(top_builddir)/ssl/libssl.la 9LDADD += $(top_builddir)/ssl/libssl.la
10LDADD += $(top_builddir)/crypto/libcrypto.la 10LDADD += $(top_builddir)/crypto/libcrypto.la
11LDADD += $(top_builddir)/tls/libtls.la
11 12
12TESTS = 13TESTS =
13check_PROGRAMS = 14check_PROGRAMS =
@@ -89,6 +90,11 @@ TESTS += cipherstest
89check_PROGRAMS += cipherstest 90check_PROGRAMS += cipherstest
90cipherstest_SOURCES = cipherstest.c 91cipherstest_SOURCES = cipherstest.c
91 92
93# clienttest
94TESTS += clienttest
95check_PROGRAMS += clienttest
96clienttest_SOURCES = clienttest.c
97
92# cts128test 98# cts128test
93TESTS += cts128test 99TESTS += cts128test
94check_PROGRAMS += cts128test 100check_PROGRAMS += cts128test
@@ -300,3 +306,7 @@ TESTS += utf8test
300check_PROGRAMS += utf8test 306check_PROGRAMS += utf8test
301utf8test_SOURCES = utf8test.c 307utf8test_SOURCES = utf8test.c
302 308
309# verifytest
310TESTS += verifytest
311check_PROGRAMS += verifytest
312verifytest_SOURCES = verifytest.c
diff --git a/update.sh b/update.sh
index 7b14b33..e4d74fb 100755
--- a/update.sh
+++ b/update.sh
@@ -25,6 +25,7 @@ libcrypto_regress=$CWD/openbsd/src/regress/lib/libcrypto
25libssl_src=$CWD/openbsd/src/lib/libssl 25libssl_src=$CWD/openbsd/src/lib/libssl
26libssl_regress=$CWD/openbsd/src/regress/lib/libssl 26libssl_regress=$CWD/openbsd/src/regress/lib/libssl
27libtls_src=$CWD/openbsd/src/lib/libtls 27libtls_src=$CWD/openbsd/src/lib/libtls
28libtls_regress=$CWD/openbsd/src/regress/lib/libtls
28openssl_app_src=$CWD/openbsd/src/usr.bin/openssl 29openssl_app_src=$CWD/openbsd/src/usr.bin/openssl
29 30
30# load library versions 31# load library versions
@@ -252,6 +253,11 @@ $CP $libssl_regress/unit/tests.h tests
252$CP $libssl_regress/certs/ca.pem tests 253$CP $libssl_regress/certs/ca.pem tests
253$CP $libssl_regress/certs/server.pem tests 254$CP $libssl_regress/certs/server.pem tests
254 255
256# copy libtls tests
257for i in `find $libtls_regress -name '*.c'`; do
258 $CP "$i" tests
259done
260
255chmod 755 tests/testssl 261chmod 755 tests/testssl
256 262
257# add headers 263# add headers