diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-12 21:28:01 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-12 21:28:01 -0500 |
| commit | 038804e13dbed8160e41e57116aa81e240f3e47a (patch) | |
| tree | 819ba31b95b2ad86580113c051eaee937debf9c1 | |
| parent | 2edfdc02a29e73a01f360f257d8dfe916a7a5b45 (diff) | |
| download | tor-038804e13dbed8160e41e57116aa81e240f3e47a.tar.gz tor-038804e13dbed8160e41e57116aa81e240f3e47a.zip | |
Tweak zero_length_keys.sh and test/include.am to make out-of-tree builds work
| -rw-r--r-- | src/test/include.am | 2 | ||||
| -rwxr-xr-x | 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 71425ea440..b9b381fdae 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 e7cb900cec..8e003a46c5 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" |