From: teor Date: Sat, 4 Oct 2014 22:59:27 +0000 (+1100) Subject: Exit test-network with status of chutney verify X-Git-Tag: tor-0.2.6.1-alpha~57^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0794d22a2fc25c8764615428f08dc0efb4df2bd;p=thirdparty%2Ftor.git Exit test-network with status of chutney verify Preserve previous semantics of src/test/test-network.sh by exiting with the exit status of chutney verify, even though the latest version ends with chutney stop. --- diff --git a/src/test/test-network.sh b/src/test/test-network.sh index d7fdb3533b..fb33842f32 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -45,6 +45,8 @@ n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do 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