Merge branch 'mr/124' into maint-0.4.4

diff --cc src/test/include.am
index e7647260c5b98c4d12fe86b2fe9bdb0685d15581,75861fb9efcd2c233686e9d6744fa284ac826514..7814dbca8953f02b68f16b2e6f87275f21a9dcbd
--- 1/src/test/include.am
--- 2/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_parseconf.sh
 +      src/test/test_cmdline.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_parseconf.sh
 +      src/test/test_cmdline.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 b3337f24b09ed0fb95c675152d00af9131b9b1b7,daa7aa524a077ac9282a767aecda7e4812ca7c11..d68dfa404700b4dfa32669f71f90b0c98af64de5
--- 1/src/test/testing_common.c
--- 2/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;