From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Feb 2015 13:30:32 +0000 (-0500)
Subject: Use --list-fingerprint instead of process control in zero_length_keys.sh
X-Git-Tag: tor-0.2.6.3-alpha~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3813e2e64e7efa6c07fc5741f94a2f6876bc317;p=thirdparty%2Ftor.git

Use --list-fingerprint instead of process control in zero_length_keys.sh

Using kill and wait in this way may have been making windows
builders unhappy.
---

diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh
index 81ba3e0e17..4dea283fdb 100755
--- a/src/test/zero_length_keys.sh
+++ b/src/test/zero_length_keys.sh
@@ -46,12 +46,7 @@ if [ -s "$DATA_DIR"/keys/secret_id_key ] && [ -s "$DATA_DIR"/keys/secret_onion_k
   exit 3
 else
   echo "Generating initial tor keys"
-  $TOR --DataDirectory "$DATA_DIR" --PidFile "$DATA_DIR"/pid &
-  TOR_PID=$!
-  # generate SIGTERM, hopefully after the keys have been regenerated
-  sleep 5
-  kill $TOR_PID
-  wait $TOR_PID
+  $TOR --DataDirectory "$DATA_DIR"  --list-fingerprint
 
   # tor must successfully generate non-zero-length key files
   if [ -s "$DATA_DIR"/keys/secret_id_key ] && [ -s "$DATA_DIR"/keys/secret_onion_key ] &&
@@ -88,12 +83,7 @@ if [ "$1" = "-z" ]; then
 fi
 
 echo "Running tor again to check if it $FILE_DESC keys"
-$TOR --DataDirectory "$DATA_DIR" --PidFile "$DATA_DIR"/pid &
-TOR_PID=$!
-# generate SIGTERM, hopefully after the keys have been regenerated
-sleep 5
-kill $TOR_PID
-wait $TOR_PID
+$TOR --DataDirectory "$DATA_DIR" --list-fingerprint
 
 #ls -lh "$DATA_DIR"/keys/ || exit 3