From cb500536eaa272c48fb04e71b84da5a3729de4ad Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Wed, 10 Jul 2024 10:02:53 +0200
Subject: [PATCH 1/2] Revert "CI: Use ccache and a single CPU when building
 spicy analyzers for btests"

This reverts commit b59bed9d06f2257a6b4f6c6408b8363a277eebac.
---
 ci/test.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ci/test.sh b/ci/test.sh
index e8c56e152a..c5304b4512 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -59,9 +59,7 @@ function run_btests {
 
     pushd testing/btest
 
-    HILTI_CXX_COMPILER_LAUNCHER=ccache \
-        HILTI_JIT_PARALLELISM=1 \
-        ZEEK_PROFILER_FILE=$(pwd)/.tmp/script-coverage/XXXXXX \
+    ZEEK_PROFILER_FILE=$(pwd)/.tmp/script-coverage/XXXXXX \
         ${BTEST} -z ${ZEEK_CI_BTEST_RETRIES} -d -A -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} || result=1
     make coverage
     prep_artifacts

From 7b99fc01a98deca53d1872c58f5346200fe49b77 Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Wed, 10 Jul 2024 10:14:26 +0200
Subject: [PATCH 2/2] testing/btest: Default to HILTI_JIT_PARALLELISM=1

This is a rework of b59bed9d06f2257a6b4f6c6408b8363a277eebac moving
HILTI_JIT_PARALLELISM=1 into btest.cfg to make it default applicable to
btest -j users (and CI).

The background for this change is that spicyz may spawn up to nproc compiler
instances by default. Combined with btest -j, this may be nproc x nproc
instances worst case. Particularly with gcc, this easily overloads CI or
local systems, putting them into hard-to-recover-from thrashing/OOM states.

Exporting HILTI_JIT_PARALLELISM in the shell allows overriding.
---
 testing/btest/btest.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/btest/btest.cfg b/testing/btest/btest.cfg
index 5668992b56..b47ff2dddf 100644
--- a/testing/btest/btest.cfg
+++ b/testing/btest/btest.cfg
@@ -14,6 +14,7 @@ MinVersion  = 0.63
 [environment]
 ZEEKPATH=`bash -c %(testbase)s/../../%(build_dir)s/zeek-path-dev`
 HILTI_CXX_COMPILER_LAUNCHER=`f=%(testbase)s/../../%(build_dir)s/CMakeCache.txt && grep -q '^ENABLE_CCACHE:BOOL=true' $f && sed -n 's/^CCACHE_PROGRAM:FILEPATH=\(.*\)$/\1/p' $f`
+HILTI_JIT_PARALLELISM=`bash -c 'echo ${HILTI_JIT_PARALLELISM:-1}'`
 ZEEK_SEED_FILE=%(testbase)s/random.seed
 ZEEK_PLUGIN_PATH=
 TZ=UTC