From 9af86bd513951e2e0ee6c66bd1a9967c7d9297a6 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Wed, 20 Dec 2023 11:17:42 +0100 Subject: [PATCH 1/2] don't attempt to kill svchost.exe on the wintendo --- jenkins/helper/async_client.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jenkins/helper/async_client.py b/jenkins/helper/async_client.py index 56f3643f7..355c86ba3 100644 --- a/jenkins/helper/async_client.py +++ b/jenkins/helper/async_client.py @@ -192,11 +192,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: From 70bed82f32189a001194598ac57fa7866a950947 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Tue, 23 Jan 2024 11:44:57 +0100 Subject: [PATCH 2/2] add coverage and maintainer switches --- jenkins/runRTAtest.fish | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/jenkins/runRTAtest.fish b/jenkins/runRTAtest.fish index 49599558b..f3aeb347e 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