force make tests to run serially

pull/1/head
John Safranek 2014-03-06 21:34:33 -08:00
parent ad93bc3510
commit 18f60966f4
4 changed files with 18 additions and 14 deletions

2
.gitignore vendored
View File

@ -41,6 +41,8 @@ output
mcapi/test mcapi/test
testsuite/testsuite testsuite/testsuite
tests/unit tests/unit
testsuite/testsuite.test
tests/unit.test
testsuite/*.der testsuite/*.der
testsuite/*.pem testsuite/*.pem
testsuite/*.raw testsuite/*.raw

View File

@ -76,8 +76,10 @@ if USE_VALGRIND
TESTS_ENVIRONMENT=./valgrind-error.sh TESTS_ENVIRONMENT=./valgrind-error.sh
endif endif
TEST_EXTENSIONS=.test
TESTS += $(check_PROGRAMS) TESTS += $(check_PROGRAMS)
test: check test: check
testsuite/testsuite.log: tests/unit.log
DISTCLEANFILES+= cyassl-config DISTCLEANFILES+= cyassl-config

View File

@ -4,20 +4,20 @@
if BUILD_EXAMPLES if BUILD_EXAMPLES
check_PROGRAMS += tests/unit check_PROGRAMS += tests/unit.test
noinst_PROGRAMS += tests/unit noinst_PROGRAMS += tests/unit.test
tests_unit_SOURCES = \ tests_unit_test_SOURCES = \
tests/unit.c \ tests/unit.c \
tests/api.c \ tests/api.c \
tests/suites.c \ tests/suites.c \
tests/hash.c \ tests/hash.c \
examples/client/client.c \ examples/client/client.c \
examples/server/server.c examples/server/server.c
tests_unit_CFLAGS = -DNO_MAIN_DRIVER $(AM_CFLAGS) tests_unit_test_CFLAGS = -DNO_MAIN_DRIVER $(AM_CFLAGS)
tests_unit_LDADD = src/libcyassl.la tests_unit_test_LDADD = src/libcyassl.la
tests_unit_DEPENDENCIES = src/libcyassl.la tests_unit_test_DEPENDENCIES = src/libcyassl.la
endif endif
EXTRA_DIST += tests/unit.h EXTRA_DIST += tests/unit.h
EXTRA_DIST += tests/test.conf \ EXTRA_DIST += tests/test.conf \
tests/test-dtls.conf tests/test-dtls.conf
DISTCLEANFILES+= tests/.libs/unit DISTCLEANFILES+= tests/.libs/unit.test

View File

@ -4,22 +4,22 @@
if BUILD_EXAMPLES if BUILD_EXAMPLES
check_PROGRAMS += testsuite/testsuite check_PROGRAMS += testsuite/testsuite.test
noinst_PROGRAMS += testsuite/testsuite noinst_PROGRAMS += testsuite/testsuite.test
testsuite_testsuite_SOURCES = \ testsuite_testsuite_test_SOURCES = \
ctaocrypt/test/test.c \ ctaocrypt/test/test.c \
examples/client/client.c \ examples/client/client.c \
examples/echoclient/echoclient.c \ examples/echoclient/echoclient.c \
examples/echoserver/echoserver.c \ examples/echoserver/echoserver.c \
examples/server/server.c \ examples/server/server.c \
testsuite/testsuite.c testsuite/testsuite.c
testsuite_testsuite_CFLAGS = -DNO_MAIN_DRIVER $(AM_CFLAGS) testsuite_testsuite_test_CFLAGS = -DNO_MAIN_DRIVER $(AM_CFLAGS)
testsuite_testsuite_LDADD = src/libcyassl.la testsuite_testsuite_test_LDADD = src/libcyassl.la
testsuite_testsuite_DEPENDENCIES = src/libcyassl.la testsuite_testsuite_test_DEPENDENCIES = src/libcyassl.la
endif endif
EXTRA_DIST += testsuite/testsuite.sln EXTRA_DIST += testsuite/testsuite.sln
EXTRA_DIST += testsuite/testsuite-ntru.vcproj EXTRA_DIST += testsuite/testsuite-ntru.vcproj
EXTRA_DIST += testsuite/testsuite.vcproj EXTRA_DIST += testsuite/testsuite.vcproj
EXTRA_DIST += input EXTRA_DIST += input
EXTRA_DIST += quit EXTRA_DIST += quit
DISTCLEANFILES+= testsuite/.libs/testsuite DISTCLEANFILES+= testsuite/.libs/testsuite.test