nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/779'

Browse Source
This commit is contained in:
Nick Mathewson 2019-03-12 11:05:27 -04:00
commit c01c6123fa
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/test-network.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/usr/bin/env bash
# This script calls the equivalent script in chutney/tools # This script calls the equivalent script in chutney/tools
@ -18,6 +18,10 @@ ECHO="${ECHO:-echo}"
# Output is prefixed with the name of the script # Output is prefixed with the name of the script
myname=$(basename "$0") myname=$(basename "$0")
# Save the arguments before we destroy them
# This might not preserve arguments with spaces in them
ORIGINAL_ARGS=( "$@" )
# We need to find CHUTNEY_PATH, so that we can call the version of this script # We need to find CHUTNEY_PATH, so that we can call the version of this script
# in chutney/tools with the same arguments. We also need to respect --quiet. # in chutney/tools with the same arguments. We also need to respect --quiet.
until [ -z "$1" ] until [ -z "$1" ]
@ -95,7 +99,7 @@ if [ -d "$CHUTNEY_PATH" ] && [ -x "$TEST_NETWORK" ]; then
# this may fail if some arguments have spaces in them # this may fail if some arguments have spaces in them
# if so, set CHUTNEY_PATH before calling test-network.sh, and spaces # if so, set CHUTNEY_PATH before calling test-network.sh, and spaces
# will be handled correctly # will be handled correctly
exec "$TEST_NETWORK" "$@" exec "$TEST_NETWORK" "${ORIGINAL_ARGS[@]}" # $ORIGINAL_ARGS
else else
$ECHO "$myname: Could not find tools/test-network.sh in CHUTNEY_PATH." $ECHO "$myname: Could not find tools/test-network.sh in CHUTNEY_PATH."
$ECHO "$myname: Please update your chutney using 'git pull'." $ECHO "$myname: Please update your chutney using 'git pull'."