From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 8 Oct 2014 19:46:29 +0000 (-0400)
Subject: Merge remote-tracking branches 'teor/issue-13161-test-network' and 'teor/issue-13161... 
X-Git-Tag: tor-0.2.6.1-alpha~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc5571e1f1e4d61d584fe20959b686d798bb7691;p=thirdparty%2Ftor.git

Merge remote-tracking branches 'teor/issue-13161-test-network' and 'teor/issue-13161-TestingDirAuthVoteExit'
---

cc5571e1f1e4d61d584fe20959b686d798bb7691
diff --cc src/test/test-network.sh
index fb33842f32,4fe4e639fe,7b59864166..d28fbde80f
--- a/src/test/test-network.sh
+++ b/src/test/test-network.sh
@@@@ -39,14 -45,9 -39,9 +45,14 @@@@ PATH="$TOR_DIR/src/or:$TOR_DIR/src/tool
   
   # Sleep some, waiting for the network to bootstrap.
   # TODO: Add chutney command 'bootstrap-status' and use that instead.
- -BOOTSTRAP_TIME=18
- -echo -n "$myname: sleeping for $BOOTSTRAP_TIME seconds"
+ +BOOTSTRAP_TIME=${BOOTSTRAP_TIME:-18}
+ +$ECHO_N "$myname: sleeping for $BOOTSTRAP_TIME seconds"
   n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do
- -    sleep 1; n=$(expr $n - 1); echo -n .
+ +    sleep 1; n=$(expr $n - 1); $ECHO_N .
   done; echo ""
   ./chutney verify $CHUTNEY_NETWORK
 ++VERIFY_EXIT_STATUS=$?
 ++# work around a bug/feature in make -j2 (or more)
 ++# where make hangs if any child processes are still alive
 ++./chutney stop $CHUTNEY_NETWORK
 ++exit $VERIFY_EXIT_STATUS