aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_keygen.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/test_keygen.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/test_keygen.sh')
-rwxr-xr-xsrc/test/test_keygen.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/test_keygen.sh b/src/test/test_keygen.sh
index 455f9e7d42..7afff271cb 100755
--- a/src/test/test_keygen.sh
+++ b/src/test/test_keygen.sh
@@ -83,10 +83,11 @@ trap "rm -rf '$DATA_DIR'" 0
DATA_DIR=`cd "${DATA_DIR}" && pwd`
touch "${DATA_DIR}/empty_torrc"
+touch "${DATA_DIR}/empty_defaults_torrc"
QUIETLY="--hush"
SILENTLY="--quiet"
-TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc"
+TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc --defaults-torrc ${DATA_DIR}/empty_defaults_torrc"
##### SETUP
#