[tor-commits] [tor/master] Use CHUTNEY_PATH to find Chutney.

[nickm at torproject.org]

commit b567efcfff72f8ba5bb9ef2612318bc18f2b4880
Author: Linus Nordberg <linus at torproject.org>
Date:   Wed Jun 5 15:48:57 2013 +0200

    Use CHUTNEY_PATH to find Chutney.
---
 Makefile.am              |    3 ++-
 src/test/test-network.sh |    8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e9976fa..a736638 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 eaecded..bbf76ed 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