[tor-commits] [tor/master] Tweak zero_length_keys.sh and test/include.am to make out-of-tree builds work

[nickm at torproject.org]

commit 038804e13dbed8160e41e57116aa81e240f3e47a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 12 21:28:01 2015 -0500

    Tweak zero_length_keys.sh and test/include.am to make out-of-tree builds work
---
 src/test/include.am          |    2 +-
 src/test/zero_length_keys.sh |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/test/include.am b/src/test/include.am
index 71425ea..b9b381f 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -122,7 +122,7 @@ if USEPYTHON
 	./src/test/test-bt-cl assert | $(PYTHON) $(top_srcdir)/src/test/bt_test.py
 	./src/test/test-bt-cl crash | $(PYTHON) $(top_srcdir)/src/test/bt_test.py
 endif
-	./src/test/zero_length_keys.sh
+	$(top_srcdir)/src/test/zero_length_keys.sh
 
 EXTRA_DIST += \
 	src/test/bt_test.py \
diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh
index e7cb900..8e003a4 100755
--- a/src/test/zero_length_keys.sh
+++ b/src/test/zero_length_keys.sh
@@ -26,7 +26,9 @@ if [ $# -lt 1 ]; then
 fi
 
 export DATA_DIR=`mktemp -d -t tor_zero_length_keys`
-TOR="src/or/tor --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345"
+# DisableNetwork means that the ORPort won't actually be opened.
+# 'ExitRelay 0' suppresses a warning.
+TOR="./src/or/tor --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0"
 
 if [ -s "$DATA_DIR"/keys/secret_id_key -a -s "$DATA_DIR"/keys/secret_onion_key -a -s "$DATA_DIR"/keys/secret_onion_key_ntor ]; then
   echo "Failure: Previous tor keys present in tor data directory"