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

Use bash in src/test/test-network.sh

Browse Source 
This ensures we reliably call chutney's newer tools/test-network.sh when
available.

Fixes bug 21562; bugfix on tor-0.2.9.1-alpha.
This commit is contained in:
teor 2017-02-27 16:11:22 +11:00
parent 1ebcd22e80
commit 73879aa5b6
No known key found for this signature in database
GPG Key ID: 450CBA7F968F094B
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug21562 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (testing):
- Use bash in src/test/test-network.sh. This ensures we reliably call
chutney's newer tools/test-network.sh when available.
Fixes bug 21562; bugfix on tor-0.2.9.1-alpha.

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

@ -1,4 +1,4 @@
#! /bin/sh
#! /bin/bash
# Please do not modify this script, it has been moved to chutney/tools
@ -178,7 +178,8 @@ export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR
# And finish up if we're doing a dry run
if [ "$NETWORK_DRY_RUN" = true ]; then
# we can't exit here, it breaks argument processing
return
# this only works in bash: return semantics are shell-specific
return 2>/dev/null || exit
fi
cd "$CHUTNEY_PATH"