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".

diff --git a/changes/test-network-bridges-hs b/changes/test-network-bridges-hs
new file mode 100644 (file)
index 0000000..a8f3521
--- /dev/null
+++ b/changes/test-network-bridges-hs
@@ -0,0 +1,6 @@
+  o Minor features (testing, bridges, hidden services):
+    - 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".

diff --git a/src/test/test-network.sh b/src/test/test-network.sh
index cc74c0f823d4b9c4940d75b6743736224563f5ea..b5d7f7c42deb39f304aae8c5ad57201344c43fd7 100755 (executable)
--- 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
 }