diff options
| author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2015-09-02 00:52:30 +1000 |
|---|---|---|
| committer | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2015-09-02 00:52:30 +1000 |
| commit | 5cde98e882408854bf9f0a3bb3c0995d1f7317af (patch) | |
| tree | b85ac70a27d93434155ccca4e052b19dcc603298 /src/test/test-network.sh | |
| parent | 6034e2133151fff25fb4aeed3b38efaab9e05532 (diff) | |
| download | tor-5cde98e882408854bf9f0a3bb3c0995d1f7317af.tar.gz tor-5cde98e882408854bf9f0a3bb3c0995d1f7317af.zip | |
Test bridges and hidden services in make test-network
Make "bridges+hs" the default test network. This tests almost all
tor functionality during make test-network, while allowing tests
to succeed on non-IPv6 systems.
Requires chutney commit 396da92 in test-network-bridges-hs.
Closes tickets 16945 (tor), 16946 (chutney) . Patches by "teor".
Diffstat (limited to 'src/test/test-network.sh')
| -rwxr-xr-x | src/test/test-network.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/test/test-network.sh b/src/test/test-network.sh index cc74c0f823..b5d7f7c42d 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -55,12 +55,20 @@ do done TOR_DIR="${TOR_DIR:-$PWD}" -NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-basic} +NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs"} 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 } |