diff options
| author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2015-08-27 10:31:35 +1000 |
|---|---|---|
| committer | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2015-08-27 10:31:35 +1000 |
| commit | d9948dfc9d2b44de66e5a85a486c65a7e2781933 (patch) | |
| tree | 1d88cde0d69d8cffc3712f10cd079ee5abbbd516 /src/test | |
| parent | b531fc7d9a8f75969b0446578ee4afcb109bae3d (diff) | |
| download | tor-d9948dfc9d2b44de66e5a85a486c65a7e2781933.tar.gz tor-d9948dfc9d2b44de66e5a85a486c65a7e2781933.zip | |
Autodetect CHUTNEY_PATH if chutney is next to tor
If the chutney and tor sources are side-by-side in the same
parent directory, autodetect the chutney path.
Closes ticket 16903. Patch by "teor".
Diffstat (limited to 'src/test')
| -rwxr-xr-x | src/test/test-network.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/test/test-network.sh b/src/test/test-network.sh index cc74c0f823..806eb183c8 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -59,8 +59,16 @@ NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-basic} CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR myname=$(basename $0) +[ -n "$CHUTNEY_PATH" ] || { + echo "$myname: \$CHUTNEY_PATH not set, trying $TOR_DIR/../chutney" + CHUTNEY_PATH="$TOR_DIR/../chutney" +} + [ -d "$CHUTNEY_PATH" ] && [ -x "$CHUTNEY_PATH/chutney" ] || { echo "$myname: missing 'chutney' in CHUTNEY_PATH ($CHUTNEY_PATH)" + echo "$myname: Get chutney: git clone https://git.torproject.org/\ +chutney.git" + echo "$myname: Set \$CHUTNEY_PATH to a non-standard location: export CHUTNEY_PATH=\`pwd\`/chutney" exit 1 } |