From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 2 Oct 2015 12:12:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'twstrike/tortls_tests'
X-Git-Tag: tor-0.2.8.1-alpha~339
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=086c33ea61644a27816a62f77c1629390e03d893;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'twstrike/tortls_tests'
---

086c33ea61644a27816a62f77c1629390e03d893
diff --cc src/test/include.am
index a9d8b652b2,a2be1ff2f1..5a5f63a341
--- a/src/test/include.am
+++ b/src/test/include.am
@@@ -95,8 -96,8 +95,9 @@@ 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_helpers.c \
          src/test/test_dns.c \
  	src/test/testing_common.c \
diff --cc src/test/test.c
index 1ab94fd9b4,3509c12788..26c27a8ea5
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -1162,8 -1157,8 +1162,9 @@@ 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 dns_tests[];
  
  struct testgroup_t testgroups[] = {
@@@ -1209,8 -1203,8 +1210,9 @@@
    { "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/thread/", thread_tests },
    { "dns/", dns_tests },