]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'twstrike/util_process_tests'
authorNick Mathewson <nickm@torproject.org>
Wed, 21 Oct 2015 20:45:49 +0000 (16:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 21 Oct 2015 20:45:49 +0000 (16:45 -0400)
1  2 
src/test/include.am
src/test/test.c

index 5b3c045de174c09264118b832ddb1b796103c6ef,0e584d4b008ac3d907fdc0a041f0ed9edc07c657..d0a819fb7fafb8708f7500d17b4b357a943a16db
@@@ -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 3468f7fdaaaecbd140568e957c69487056ad73a3,a4315389f4501db4f9edf4bf6093fc82fcac40ce..1c421d98ab4b9fe67a1e90763f11748db800ff18
@@@ -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[] = {
    { "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