diff --git a/jenkins/helper/async_client.py b/jenkins/helper/async_client.py index 1861ab6e..efea8305 100644 --- a/jenkins/helper/async_client.py +++ b/jenkins/helper/async_client.py @@ -208,11 +208,12 @@ def kill_children(identifier, params, children): if one_child.pid in killed: continue try: - killed.append(one_child.pid) - err += add_message_to_report( - params, - f"{identifier}: killing {one_child.name()} - {str(one_child.pid)}") - one_child.resume() + if one_child.name() != "svchost.exe": + killed.append(one_child.pid) + err += add_message_to_report( + params, + f"{identifier}: killing {one_child.name()} - {str(one_child.pid)}") + one_child.resume() except FileNotFoundError: pass except AttributeError: diff --git a/jenkins/runRTAtest.fish b/jenkins/runRTAtest.fish index 49599558..f3aeb347 100755 --- a/jenkins/runRTAtest.fish +++ b/jenkins/runRTAtest.fish @@ -15,6 +15,16 @@ if test "$ASAN" = "true" sanOn and buildSanFlags "$WORKDIR/work/ArangoDB" end +if test "$COVERAGE" = "true" + echo "Coverage build" + coverageOn + rm -rf $WORKDIR/work/gcov.old + if test -d $WORKDIR/work/gcov ; mv $WORKDIR/work/gcov $WORKDIR/work/gcov.old ; end +end +if test "$BUILD_MODE" = "maintainer" + echo "switching to maintainer build" + maintainerOn +end if test "$BUILD_MODE" = "debug" echo "switching to debug build" debugMode @@ -46,6 +56,9 @@ for f in $matches echo $f | grep -qv testreport ; and echo "mv $f $WORKSPACE" ; and mv $f $WORKSPACE; or echo "skipping $f" end +if test "$COVERAGE" = "true" + collectCoverage +end unlockDirectory exit $s