mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 20:23:03 +02:00
Code

Use CHUTNEY_PATH to find Chutney.

Browse Source
This commit is contained in:
Linus Nordberg 2013-06-05 15:48:57 +02:00
parent c82d7950ad
commit b567efcfff
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -60,7 +60,8 @@ doxygen:
test: all
./src/test/test
# Requires a copy of Chutney in ./chutney
# Note that test-network requires a copy of Chutney in $CHUTNEY_PATH.
# Chutney can be cloned from https://git.torproject.org/chutney.git .
test-network: all
./src/test/test-network.sh

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

@ -1,15 +1,17 @@
#! /bin/sh
CHUTNEY_BASEDIR=./chutney # FIXME
# NOTE: Requires Chutney in $CHUTNEY_PATH.
TOR_DIR=$(/bin/pwd)/src/or
NETWORK_FLAVOUR=basic
CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR
myname=$(/usr/bin/basename $0)
cd $CHUTNEY_BASEDIR || {
echo "$myname: missing chutney dir: $CHUTNEY_BASEDIR"
[ -d "$CHUTNEY_PATH" ] && [ -x "$CHUTNEY_PATH/chutney" ] || {
echo "$myname: missing 'chutney' in CHUTNEY_PATH ($CHUTNEY_PATH)"
exit 1
}
cd "$CHUTNEY_PATH"
PATH=$TOR_DIR:$PATH # For picking up the right tor binary.
./tools/bootstrap-network.sh $NETWORK_FLAVOUR || exit 2