diff options
| -rw-r--r-- | tests/Makefile.am | 10 | ||||
| -rwxr-xr-x | update.sh | 6 |
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 | |||
| 8 | LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) | 8 | LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) |
| 9 | LDADD += $(top_builddir)/ssl/libssl.la | 9 | LDADD += $(top_builddir)/ssl/libssl.la |
| 10 | LDADD += $(top_builddir)/crypto/libcrypto.la | 10 | LDADD += $(top_builddir)/crypto/libcrypto.la |
| 11 | LDADD += $(top_builddir)/tls/libtls.la | ||
| 11 | 12 | ||
| 12 | TESTS = | 13 | TESTS = |
| 13 | check_PROGRAMS = | 14 | check_PROGRAMS = |
| @@ -89,6 +90,11 @@ TESTS += cipherstest | |||
| 89 | check_PROGRAMS += cipherstest | 90 | check_PROGRAMS += cipherstest |
| 90 | cipherstest_SOURCES = cipherstest.c | 91 | cipherstest_SOURCES = cipherstest.c |
| 91 | 92 | ||
| 93 | # clienttest | ||
| 94 | TESTS += clienttest | ||
| 95 | check_PROGRAMS += clienttest | ||
| 96 | clienttest_SOURCES = clienttest.c | ||
| 97 | |||
| 92 | # cts128test | 98 | # cts128test |
| 93 | TESTS += cts128test | 99 | TESTS += cts128test |
| 94 | check_PROGRAMS += cts128test | 100 | check_PROGRAMS += cts128test |
| @@ -300,3 +306,7 @@ TESTS += utf8test | |||
| 300 | check_PROGRAMS += utf8test | 306 | check_PROGRAMS += utf8test |
| 301 | utf8test_SOURCES = utf8test.c | 307 | utf8test_SOURCES = utf8test.c |
| 302 | 308 | ||
| 309 | # verifytest | ||
| 310 | TESTS += verifytest | ||
| 311 | check_PROGRAMS += verifytest | ||
| 312 | verifytest_SOURCES = verifytest.c | ||
| @@ -25,6 +25,7 @@ libcrypto_regress=$CWD/openbsd/src/regress/lib/libcrypto | |||
| 25 | libssl_src=$CWD/openbsd/src/lib/libssl | 25 | libssl_src=$CWD/openbsd/src/lib/libssl |
| 26 | libssl_regress=$CWD/openbsd/src/regress/lib/libssl | 26 | libssl_regress=$CWD/openbsd/src/regress/lib/libssl |
| 27 | libtls_src=$CWD/openbsd/src/lib/libtls | 27 | libtls_src=$CWD/openbsd/src/lib/libtls |
| 28 | libtls_regress=$CWD/openbsd/src/regress/lib/libtls | ||
| 28 | openssl_app_src=$CWD/openbsd/src/usr.bin/openssl | 29 | openssl_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 | ||
| 257 | for i in `find $libtls_regress -name '*.c'`; do | ||
| 258 | $CP "$i" tests | ||
| 259 | done | ||
| 260 | |||
| 255 | chmod 755 tests/testssl | 261 | chmod 755 tests/testssl |
| 256 | 262 | ||
| 257 | # add headers | 263 | # add headers |
