From ca6ae51179c261e5e5f6ec96cc8ff2933cfe3666 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sun, 4 May 2025 19:41:11 +0100 Subject: [PATCH] CI: try to fix jenkins from counting every test twice --- test/integration/wrapper.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/integration/wrapper.py b/test/integration/wrapper.py index 47138988..8924bf93 100755 --- a/test/integration/wrapper.py +++ b/test/integration/wrapper.py @@ -40,7 +40,11 @@ pid = os.getpid() rand = random.randint(0, 1000) value = f'{pid}-{rand}' for var in ['GTEST_OUTPUT']: - if var in os.environ: + if test == '': + # Avoid outputting xml during test discovery + # Otherwise jenkins counts every test twice + del os.environ[var] + elif var in os.environ: os.environ[var] = os.environ[var].replace('XXX', value) binary = os.environ['INTTEST_BIN']