mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge remote-tracking branch 'teor/master'
This commit is contained in:
commit
569368e5a9
6
changes/test-network-bridges-hs
Normal file
6
changes/test-network-bridges-hs
Normal file
@ -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".
|
@ -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
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user