diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-23 11:15:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-23 11:15:53 -0500 |
| commit | 7322de15dc2f0858291f40df1a55a66c80b7fda9 (patch) | |
| tree | 5d1159b5330c587667a6ea369c93e3160be59175 /src/test/include.am | |
| parent | 420037dcefade09f43e4a6e44282ed04f9f3ac52 (diff) | |
| download | tor-7322de15dc2f0858291f40df1a55a66c80b7fda9.tar.gz tor-7322de15dc2f0858291f40df1a55a66c80b7fda9.zip | |
Split the slow unit tests into their own binary
This can run in parallel with the faster ones and the other tests.
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/test/include.am b/src/test/include.am index d206033009..595be0b7c2 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,8 +1,12 @@ -TESTS += src/test/test +TESTS += src/test/test src/test/test-slow noinst_PROGRAMS+= src/test/bench if UNITTESTS_ENABLED -noinst_PROGRAMS+= src/test/test src/test/test-child src/test/test_workqueue +noinst_PROGRAMS+= \ + src/test/test \ + src/test/test-slow \ + src/test/test-child \ + src/test/test_workqueue endif src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ @@ -57,8 +61,17 @@ src_test_test_SOURCES = \ src/test/test_status.c \ src/test/test_threads.c \ src/test/test_util.c \ + src/test/testing_common.c \ src/ext/tinytest.c +src_test_test_slow_SOURCES = \ + src/test/test_slow.c \ + src/test/test_crypto_slow.c \ + src/test/test_util_slow.c \ + src/test/testing_common.c \ + src/ext/tinytest.c + + src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_test_test_CPPFLAGS= $(src_test_AM_CPPFLAGS) @@ -80,6 +93,11 @@ src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ @TOR_SYSTEMD_LIBS@ +src_test_test_slow_CPPFLAGS = $(src_test_test_CPPFLAGS) +src_test_test_slow_CFLAGS = $(src_test_test_CFLAGS) +src_test_test_slow_LDADD = $(src_test_test_LDADD) +src_test_test_slow_LDFLAGS = $(src_test_test_LDFLAGS) + src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \ |