[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge remote-tracking branch 'public/fancy_test_tricks'
commit c0391bae75e9eb71f5fa2ab24fc97792c204225d
Merge: 2cb59be ec6c155
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Mon Jul 15 12:02:18 2013 -0400
Merge remote-tracking branch 'public/fancy_test_tricks'
Conflicts:
src/common/include.am
Conflict was from adding testsupport.h near where sandbox.h had
already been added.
.gitignore | 6 ++
Makefile.am | 8 ++
changes/fancy_testing | 27 +++++++
configure.ac | 16 +++-
contrib/cov-diff | 17 ++++
contrib/coverage | 13 ++++
src/common/crypto.c | 6 +-
src/common/crypto.h | 7 +-
src/common/crypto_curve25519.c | 2 +-
src/common/crypto_curve25519.h | 5 +-
src/common/crypto_format.c | 1 -
src/common/include.am | 35 ++++++++-
src/common/log.c | 4 +
src/common/testsupport.h | 80 +++++++++++++++++++
src/common/torlog.h | 6 --
src/common/tortls.c | 3 -
src/common/util.c | 4 +-
src/common/util.h | 5 +-
src/or/addressmap.c | 2 +-
src/or/addressmap.h | 6 +-
src/or/buffers.c | 2 +-
src/or/buffers.h | 4 +-
src/or/circuitlist.c | 5 +-
src/or/circuitlist.h | 6 ++
src/or/circuitmux.c | 10 +--
src/or/circuitmux.h | 8 +-
src/or/circuitstats.c | 21 ++++-
src/or/circuitstats.h | 21 ++---
src/or/config.c | 2 -
src/or/config.h | 3 -
src/or/connection_edge.c | 4 +-
src/or/connection_edge.h | 6 +-
src/or/control.c | 4 +-
src/or/control.h | 4 +-
src/or/dirserv.c | 18 ++---
src/or/dirserv.h | 23 +++---
src/or/dirvote.c | 4 +-
src/or/dirvote.h | 6 +-
src/or/geoip.c | 6 +-
src/or/geoip.h | 8 +-
src/or/hibernate.c | 2 +
src/or/hibernate.h | 2 +
src/or/include.am | 30 ++++++-
src/or/main.c | 9 +--
src/or/main.h | 4 -
src/or/ntmain.c | 1 -
src/or/relay.c | 2 +-
src/or/relay.h | 5 +-
src/or/replaycache.c | 4 +-
src/or/replaycache.h | 4 +-
src/or/router.c | 2 +-
src/or/router.h | 4 +-
src/or/routerlist.c | 4 +-
src/or/routerlist.h | 9 ++-
src/or/transports.c | 10 +--
src/or/transports.h | 10 +--
src/test/bench.c | 1 -
src/test/include.am | 17 ++--
src/test/test.c | 3 +-
src/test/test_circuitlist.c | 168 ++++++++++++++++++++++++++++++++++++++++
src/test/test_crypto.c | 3 +-
src/tools/tor-checkkey.c | 2 -
src/tools/tor-gencert.c | 2 -
63 files changed, 566 insertions(+), 150 deletions(-)
diff --cc src/common/include.am
index e700bd5,3f5a0e0..032befd
--- a/src/common/include.am
+++ b/src/common/include.am
@@@ -49,10 -59,9 +59,10 @@@ LIBOR_A_SOURCES =
src/common/procmon.c \
src/common/util.c \
src/common/util_codedigest.c \
+ src/common/sandbox.c \
$(libor_extra_source)
- src_common_libor_crypto_a_SOURCES = \
+ LIBOR_CRYPTO_A_SOURCES = \
src/common/aes.c \
src/common/crypto.c \
src/common/crypto_format.c \
@@@ -75,7 -100,7 +101,8 @@@ COMMONHEADERS =
src/common/memarea.h \
src/common/mempool.h \
src/common/procmon.h \
+ src/common/sandbox.h \
+ src/common/testsupport.h \
src/common/torgzip.h \
src/common/torint.h \
src/common/torlog.h \
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits