diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-13 09:46:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-13 09:46:50 -0400 |
| commit | 8c8ed91aae24aa1188275dfb6fbd5f6fcbcbe1a8 (patch) | |
| tree | 4a794d685c23d8d6622108a542d458fa66448433 /src/test | |
| parent | 1b04dab60c549d9f0d621e1a115cab8a49c839f9 (diff) | |
| parent | b7fae0f48ce63371cd2454a0b59d423778a2a7c6 (diff) | |
| download | tor-8c8ed91aae24aa1188275dfb6fbd5f6fcbcbe1a8.tar.gz tor-8c8ed91aae24aa1188275dfb6fbd5f6fcbcbe1a8.zip | |
Merge remote-tracking branch 'rl1987/bug24891'
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/include.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/test/include.am b/src/test/include.am index 9543635c84..48257467af 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -79,7 +79,10 @@ src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ # This seems to matter nowhere but on Windows, but I assure you that it # matters a lot there, and is quite hard to debug if you forget to do it. -src_test_test_SOURCES = \ +src_test_test_SOURCES = + +if UNITTESTS_ENABLED +src_test_test_SOURCES += \ src/test/log_test_helpers.c \ src/test/hs_test_helpers.c \ src/test/rend_test_helpers.c \ @@ -178,14 +181,18 @@ src_test_test_SOURCES = \ src/test/testing_common.c \ src/test/testing_rsakeys.c \ src/ext/tinytest.c +endif -src_test_test_slow_SOURCES = \ +src_test_test_slow_SOURCES = +if UNITTESTS_ENABLED +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/test/testing_rsakeys.c \ src/ext/tinytest.c +endif src_test_test_memwipe_SOURCES = \ src/test/test-memwipe.c |