diff options
| -rw-r--r-- | changes/bug13331-make-j2-test-network-hang | 3 | ||||
| -rwxr-xr-x | src/test/test-network.sh | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug13331-make-j2-test-network-hang b/changes/bug13331-make-j2-test-network-hang new file mode 100644 index 0000000000..85c0ad8e37 --- /dev/null +++ b/changes/bug13331-make-j2-test-network-hang @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Stop an apparent test-network hang when used with make -j2. + Fixes bug 13331. 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 |