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

[nickm@xxxxxxxxxxxxxx]

commit 086c33ea61644a27816a62f77c1629390e03d893
Merge: 6718222 94e5db3
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Oct 2 14:12:27 2015 +0200

    Merge remote-tracking branch 'twstrike/tortls_tests'

 src/common/crypto.c    |   13 +-
 src/common/crypto.h    |    9 +-
 src/common/tortls.c    |  242 ++---
 src/common/tortls.h    |  111 +-
 src/test/include.am    |    1 +
 src/test/test.c        |    3 +-
 src/test/test_tortls.c | 2762 ++++++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 2971 insertions(+), 170 deletions(-)

diff --cc src/test/include.am
index a9d8b65,a2be1ff..5a5f63a
--- 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 1ab94fd,3509c12..26c27a8
--- 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 },



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits