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

test-network.sh: tools dir in PATH, parameterization

Browse Source
This commit is contained in:
Jim Pannacciulli 2013-09-29 01:24:14 -04:00 committed by Nick Mathewson
parent 09e850dc36
commit 8bc5b9f3d0
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,30 @@
#! /bin/sh #! /bin/sh
# NOTE: Requires Chutney in $CHUTNEY_PATH. until [ -z $1 ]
do
case $1 in
--chutney-path)
export CHUTNEY_PATH="$2"
shift
;;
--tor-path)
export TOR_DIR="$2"
shift
;;
--flavo?r|--network-flavo?r)
export NETWORK_FLAVOUR="$2"
shift
;;
*)
echo "Sorry, I don't know what to do with '$1'."
exit 2
;;
esac
shift
done
TOR_DIR=$(pwd)/src/or TOR_DIR="${TOR_DIR:-$PWD}"
NETWORK_FLAVOUR=basic NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-basic}
CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR
myname=$(basename $0) myname=$(basename $0)
@ -12,7 +33,8 @@ myname=$(basename $0)
exit 1 exit 1
} }
cd "$CHUTNEY_PATH" cd "$CHUTNEY_PATH"
PATH=$TOR_DIR:$PATH # For picking up the right tor binary. # For picking up the right tor binaries.
PATH="$TOR_DIR/src/or:$TOR_DIR/src/tools:$PATH"
./tools/bootstrap-network.sh $NETWORK_FLAVOUR || exit 2 ./tools/bootstrap-network.sh $NETWORK_FLAVOUR || exit 2
# Sleep some, waiting for the network to bootstrap. # Sleep some, waiting for the network to bootstrap.