Commit b567efcf authored by Linus Nordberg's avatar Linus Nordberg
Browse files

Use CHUTNEY_PATH to find Chutney.

parent c82d7950
Loading
Loading
Loading
Loading
+2 −1
Changes for Makefile.am: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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

+5 −3
Changes for src/test/test-network.sh: 5 added lines, 3 removed lines.
Original line number Diff line number Diff line
#! /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