[tor-commits] [tor/release-0.2.6] Have zero_length_keys.sh use an empty torrc file.

[nickm at torproject.org]

commit d7fcaca3fcbc46c2aebe556c6649ce1eddb833dd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 26 15:21:31 2015 -0500

    Have zero_length_keys.sh use an empty torrc file.
    
    Fixes 15033; bugfix on 0.2.6.3-alpha.
---
 changes/bug15033             |    4 ++++
 src/test/zero_length_keys.sh |    4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug15033 b/changes/bug15033
new file mode 100644
index 0000000..953e6c3
--- /dev/null
+++ b/changes/bug15033
@@ -0,0 +1,4 @@
+  o Minor bugfixes (tests):
+    - When running the zero-length-keys check, do not use the default
+      torrc file. Fixes bug 15033; bugfix on 0.2.6.3-alpha. Reported
+      by "reezer".
diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh
index 4dea283..2fd11d3 100755
--- a/src/test/zero_length_keys.sh
+++ b/src/test/zero_length_keys.sh
@@ -36,9 +36,11 @@ if [ ! -d "$DATA_DIR" ]; then
 fi
 trap "rm -rf '$DATA_DIR'" 0
 
+touch "$DATA_DIR"/empty_torrc
+
 # 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"
+TOR="./src/or/tor --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_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