diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-08 15:42:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-08 15:42:20 -0400 |
| commit | 40375fbce595b6279d5af5ecf7e6e46f43901558 (patch) | |
| tree | bff8b2de8639576009bf204e4d4e5dacf920b2d9 /src/test | |
| parent | 22a0708133f09d8703b3c64edfc55b5cdf904976 (diff) | |
| parent | c0794d22a2fc25c8764615428f08dc0efb4df2bd (diff) | |
| download | tor-40375fbce595b6279d5af5ecf7e6e46f43901558.tar.gz tor-40375fbce595b6279d5af5ecf7e6e46f43901558.zip | |
Merge remote-tracking branch 'teor/test-network-hang-on-make-j2'
Diffstat (limited to 'src/test')
| -rwxr-xr-x | src/test/test-network.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/test/test-network.sh b/src/test/test-network.sh index 7b59864166..fb33842f32 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -45,3 +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 |