aboutsummaryrefslogtreecommitdiff
path: root/src/test/zero_length_keys.sh
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-04-10 19:03:43 +1000
committerteor <teor@torproject.org>2019-04-10 19:03:43 +1000
commit12b9bfc05f3a163b44f0f8b6638f027de16e622b (patch)
treeceeaaefe130bdd5953eca62c441e8005effbd9c3 /src/test/zero_length_keys.sh
parentacec0192c3d6400316037cdc3e4c9093c1919252 (diff)
downloadtor-12b9bfc05f3a163b44f0f8b6638f027de16e622b.tar.gz
tor-12b9bfc05f3a163b44f0f8b6638f027de16e622b.zip
test: Also avoid reading the system default torrc in integration tests
Part of 29702.
Diffstat (limited to 'src/test/zero_length_keys.sh')
-rwxr-xr-xsrc/test/zero_length_keys.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh
index 3c61f8d465..5635bdfd89 100755
--- a/src/test/zero_length_keys.sh
+++ b/src/test/zero_length_keys.sh
@@ -43,10 +43,11 @@ fi
trap "rm -rf '$DATA_DIR'" 0
touch "$DATA_DIR"/empty_torrc
+touch "$DATA_DIR"/empty_defaults_torrc
# DisableNetwork means that the ORPort won't actually be opened.
# 'ExitRelay 0' suppresses a warning.
-TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc"
+TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc --defaults-torrc $DATA_DIR/empty_defaults_torrc"
if [ -s "$DATA_DIR"/keys/secret_id_key ] && [ -s "$DATA_DIR"/keys/secret_onion_key ] &&
[ -s "$DATA_DIR"/keys/secret_onion_key_ntor ]; then