From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 15 Dec 2015 18:11:06 +0000 (-0500)
Subject: Merge branch 'feature8195_small_squashed'
X-Git-Tag: tor-0.2.8.1-alpha~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aba39ea39075803c974ab6451a55b52deb425468;p=thirdparty%2Ftor.git

Merge branch 'feature8195_small_squashed'
---

aba39ea39075803c974ab6451a55b52deb425468
diff --cc src/test/include.am
index f593782709,3fed3b7344..d52867b94e
--- 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