summaryrefslogtreecommitdiff
path: root/src/test/include.am
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2020-08-19 13:55:07 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2020-08-19 13:55:07 +0300
commitb1b007967599ccac2de91aa36d3a11a9bcb4ffdb (patch)
tree538485882a30d20d273023cc40cac2fe4007926e /src/test/include.am
parentdeea19637006dd9bf65431acf2e15f96f3209602 (diff)
parent974abdf6325be29f04fcb3b332dce2bb3ac15a9c (diff)
downloadtor-b1b007967599ccac2de91aa36d3a11a9bcb4ffdb.tar.gz
tor-b1b007967599ccac2de91aa36d3a11a9bcb4ffdb.zip
Merge branch 'mr/124' into maint-0.4.4
Diffstat (limited to 'src/test/include.am')
-rw-r--r--src/test/include.am22
1 files changed, 19 insertions, 3 deletions
diff --git a/src/test/include.am b/src/test/include.am
index e7647260c5..7814dbca89 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -25,7 +25,15 @@ TESTSCRIPTS = \
src/test/test_workqueue_socketpair.sh \
src/test/test_switch_id.sh \
src/test/test_cmdline.sh \
- src/test/test_parseconf.sh
+ src/test/test_parseconf.sh \
+ src/test/unittest_part1.sh \
+ src/test/unittest_part2.sh \
+ src/test/unittest_part3.sh \
+ src/test/unittest_part4.sh \
+ src/test/unittest_part5.sh \
+ src/test/unittest_part6.sh \
+ src/test/unittest_part7.sh \
+ src/test/unittest_part8.sh
if USE_RUST
TESTSCRIPTS += \
@@ -54,7 +62,7 @@ TESTSCRIPTS += \
scripts/maint/checkSpaceTest.sh
endif
-TESTS += src/test/test src/test/test-slow src/test/test-memwipe \
+TESTS += src/test/test-slow src/test/test-memwipe \
src/test/test_workqueue \
src/test/test_keygen.sh \
src/test/test_key_expiration.sh \
@@ -447,7 +455,15 @@ EXTRA_DIST += \
src/test/test_workqueue_pipe2.sh \
src/test/test_workqueue_socketpair.sh \
src/test/test_cmdline.sh \
- src/test/test_parseconf.sh
+ src/test/test_parseconf.sh \
+ src/test/unittest_part1.sh \
+ src/test/unittest_part2.sh \
+ src/test/unittest_part3.sh \
+ src/test/unittest_part4.sh \
+ src/test/unittest_part5.sh \
+ src/test/unittest_part6.sh \
+ src/test/unittest_part7.sh \
+ src/test/unittest_part8.sh
test-rust:
$(TESTS_ENVIRONMENT) "$(abs_top_srcdir)/src/test/test_rust.sh"