[tor-commits] [tor/master] Merge remote-tracking branch 'twstrike/util_process_tests'

[nickm at torproject.org]

commit a61158aa237429d046f34d9f3db5a7dc7c40ba5e
Merge: 5e9f238 c31791b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 21 16:45:49 2015 -0400

    Merge remote-tracking branch 'twstrike/util_process_tests'

 src/test/include.am          |    1 +
 src/test/test.c              |    3 +-
 src/test/test_util_process.c |   72 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 1 deletion(-)

diff --cc src/test/include.am
index 5b3c045,0e584d4..d0a819f
--- a/src/test/include.am
+++ b/src/test/include.am
@@@ -99,11 -96,10 +99,12 @@@ src_test_test_SOURCES = 
  	src/test/test_socks.c \
  	src/test/test_status.c \
  	src/test/test_threads.c \
 +	src/test/test_tortls.c \
  	src/test/test_util.c \
 +	src/test/test_util_format.c \
+ 	src/test/test_util_process.c \
  	src/test/test_helpers.c \
 -        src/test/test_dns.c \
 +	src/test/test_dns.c \
  	src/test/testing_common.c \
  	src/ext/tinytest.c
  
diff --cc src/test/test.c
index 3468f7f,a431538..1c421d9
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -1165,9 -1157,8 +1165,10 @@@ extern struct testcase_t scheduler_test
  extern struct testcase_t socks_tests[];
  extern struct testcase_t status_tests[];
  extern struct testcase_t thread_tests[];
 +extern struct testcase_t tortls_tests[];
  extern struct testcase_t util_tests[];
 +extern struct testcase_t util_format_tests[];
+ extern struct testcase_t util_process_tests[];
  extern struct testcase_t dns_tests[];
  
  struct testgroup_t testgroups[] = {
@@@ -1216,10 -1203,9 +1217,11 @@@
    { "scheduler/", scheduler_tests },
    { "socks/", socks_tests },
    { "status/" , status_tests },
 +  { "tortls/", tortls_tests },
    { "util/", util_tests },
 +  { "util/format/", util_format_tests },
    { "util/logging/", logging_tests },
+   { "util/process/", util_process_tests },
    { "util/thread/", thread_tests },
    { "dns/", dns_tests },
    END_OF_GROUPS