[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.3
commit b5a88e8d478e553eb7c6bc022d47a084d6845e64
Merge: beffad8529 ed6a328297
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Wed Oct 7 08:01:37 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/parallel_unit_test | 4 ++++
src/test/include.am | 23 ++++++++++++++++++++---
src/test/testing_common.c | 42 ++++++++++++++++++++++++++++++++++++++++++
src/test/unittest_part1.sh | 3 +++
src/test/unittest_part2.sh | 3 +++
src/test/unittest_part3.sh | 3 +++
src/test/unittest_part4.sh | 3 +++
src/test/unittest_part5.sh | 3 +++
src/test/unittest_part6.sh | 3 +++
src/test/unittest_part7.sh | 3 +++
src/test/unittest_part8.sh | 3 +++
11 files changed, 90 insertions(+), 3 deletions(-)
diff --cc src/test/include.am
index 90e50752ce,75861fb9ef..33556083df
--- a/src/test/include.am
+++ b/src/test/include.am
@@@ -24,8 -24,14 +24,17 @@@ TESTSCRIPTS =
src/test/test_workqueue_pipe2.sh \
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/test_switch_id.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 += \
@@@ -33,27 -39,11 +42,27 @@@
endif
if USEPYTHON
-TESTSCRIPTS += src/test/test_ntor.sh src/test/test_hs_ntor.sh src/test/test_bt.sh
+TESTSCRIPTS += \
+ src/test/test_ntor.sh \
+ src/test/test_hs_ntor.sh \
+ src/test/test_bt.sh \
+ scripts/maint/practracker/test_practracker.sh
+
+if COVERAGE_ENABLED
+# ...
+else
+# Only do this when coverage is not on, since it invokes lots of code
+# in a kind of unpredictable way.
TESTSCRIPTS += src/test/test_rebind.sh
endif
+endif
+
+if USE_PERL
+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 \
@@@ -431,8 -378,14 +440,16 @@@ EXTRA_DIST +=
src/test/test_workqueue_pipe.sh \
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"
diff --cc src/test/testing_common.c
index e9aa4112c0,daa7aa524a..d7c6edb646
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@@ -282,10 -276,10 +282,12 @@@ main(int c, const char **v
tor_libevent_initialize(&cfg);
control_initialize_event_queue();
- configure_backtrace_handler(get_version());
+
+ /* Don't add default logs; the tests manage their own. */
+ quiet_level = QUIET_SILENT;
+ unsigned num=1, den=1;
+
for (i_out = i = 1; i < c; ++i) {
if (!strcmp(v[i], "--warn")) {
loglevel = LOG_WARN;
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits