nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweak zero_length_keys.sh and test/include.am to make out-of-tree builds work

Browse Source
This commit is contained in:
Nick Mathewson 2015-01-12 21:28:01 -05:00
parent 2edfdc02a2
commit 038804e13d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/include.am
View File

@ -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 assert | $(PYTHON) $(top_srcdir)/src/test/bt_test.py
./src/test/test-bt-cl crash | $(PYTHON) $(top_srcdir)/src/test/bt_test.py ./src/test/test-bt-cl crash | $(PYTHON) $(top_srcdir)/src/test/bt_test.py
endif endif
./src/test/zero_length_keys.sh $(top_srcdir)/src/test/zero_length_keys.sh
EXTRA_DIST += \ EXTRA_DIST += \
src/test/bt_test.py \ src/test/bt_test.py \

4
src/test/zero_length_keys.sh
View File

@ -26,7 +26,9 @@ if [ $# -lt 1 ]; then
fi fi
export DATA_DIR=`mktemp -d -t tor_zero_length_keys` 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 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" echo "Failure: Previous tor keys present in tor data directory"