commit b1b007967599ccac2de91aa36d3a11a9bcb4ffdb Merge: deea196370 974abdf632 Author: George Kadianakis desnacked@riseup.net Date: Wed Aug 19 13:55:07 2020 +0300
Merge branch 'mr/124' into maint-0.4.4
changes/parallel_unit_test | 4 ++++ src/test/include.am | 22 +++++++++++++++++++--- 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, 89 insertions(+), 3 deletions(-)
diff --cc src/test/include.am index e7647260c5,75861fb9ef..7814dbca89 --- a/src/test/include.am +++ b/src/test/include.am @@@ -24,8 -24,14 +24,16 @@@ 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/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,28 -39,11 +41,28 @@@ 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 \ + scripts/maint/run_check_subsystem_order.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 \ @@@ -446,8 -378,14 +454,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 b3337f24b0,daa7aa524a..d68dfa4047 --- 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;