commit aba39ea39075803c974ab6451a55b52deb425468 Merge: 744958e 405a8d3 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 15 13:11:06 2015 -0500 Merge branch 'feature8195_small_squashed' .gitignore | 2 + changes/feature8195 | 6 ++ configure.ac | 16 +++- doc/tor.1.txt | 8 ++ src/common/compat.c | 108 +++++++++++++++++++++++++- src/common/compat.h | 13 +++- src/or/config.c | 49 ++++++++++-- src/or/or.h | 3 + src/test/include.am | 17 ++++- src/test/test_switch_id.c | 181 ++++++++++++++++++++++++++++++++++++++++++++ src/test/test_switch_id.sh | 25 ++++++ 11 files changed, 414 insertions(+), 14 deletions(-) diff --cc src/test/include.am index f593782,3fed3b7..d52867b --- a/src/test/include.am +++ b/src/test/include.am @@@ -1,14 -1,11 +1,15 @@@ - -export PYTHON=@PYTHON@ -export SHELL=@SHELL@ -export abs_top_srcdir=@abs_top_srcdir@ -export builddir=@builddir@ +# When the day comes that Tor requires Automake >= 1.12 change +# TESTS_ENVIRONMENT to AM_TESTS_ENVIRONMENT because the former is reserved for +# users while the later is reserved for developers. +TESTS_ENVIRONMENT = \ + export PYTHON="$(PYTHON)"; \ + export SHELL="$(SHELL)"; \ + export abs_top_srcdir="$(abs_top_srcdir)"; \ + export builddir="$(builddir)"; \ + export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; - TESTSCRIPTS = src/test/test_zero_length_keys.sh + TESTSCRIPTS = src/test/test_zero_length_keys.sh \ + src/test/test_switch_id.sh if USEPYTHON TESTSCRIPTS += src/test/test_ntor.sh src/test/test_bt.sh