diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-17 08:30:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-17 08:30:32 -0500 |
| commit | c3813e2e64e7efa6c07fc5741f94a2f6876bc317 (patch) | |
| tree | 80f15c6353d70178a23f88550762db060cbacf43 /src | |
| parent | 8375663adf9b3150d3970b539cc941cc0e548eb5 (diff) | |
| download | tor-c3813e2e64e7efa6c07fc5741f94a2f6876bc317.tar.gz tor-c3813e2e64e7efa6c07fc5741f94a2f6876bc317.zip | |
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.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/test/zero_length_keys.sh | 14 |
1 files changed, 2 insertions, 12 deletions
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 |