diff options
| author | Linus Nordberg <linus@torproject.org> | 2013-06-05 15:48:57 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@torproject.org> | 2013-06-14 14:17:42 +0200 |
| commit | b567efcfff72f8ba5bb9ef2612318bc18f2b4880 (patch) | |
| tree | 52d421a0f6ec7e413f1fc605db7bf2986f3f5a17 | |
| parent | c82d7950ad9a1614a8f3929f53eaed572c9d9e2e (diff) | |
| download | tor-b567efcfff72f8ba5bb9ef2612318bc18f2b4880.tar tor-b567efcfff72f8ba5bb9ef2612318bc18f2b4880.tar.gz | |
Use CHUTNEY_PATH to find Chutney.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rwxr-xr-x | src/test/test-network.sh | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index e9976fa65..a736638e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/src/test/test-network.sh b/src/test/test-network.sh index eaecded99..bbf76ede7 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -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 |