update fior asan/ubsan root630 ibs

cms-sw · Nov 16, 2023 · 961359f · 961359f
1 parent 39d6b9c
commit 961359f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/RelValArgs.py b/RelValArgs.py
@@ -64,7 +64,7 @@
 RELVAL_KEYS["enableIMT"].append(
     [THREADED_ROOT, "--customise FWCore/Concurrency/enableIMT.enableIMT"]
 )
-RELVAL_KEYS["TIMEOUT"].append(["(_ASAN_|_ppc64|_aarch64_)", "14400"])
+RELVAL_KEYS["TIMEOUT"].append(["(ASAN|_ppc64|_aarch64_)", "14400"])
 RELVAL_KEYS["TIMEOUT"].append([".+", "9000"])
 if "CMS_RELVALS_USER_OPTS" in environ:
     RELVAL_KEYS["USER_OVERRIDE_OPTS"].append([".+", environ["CMS_RELVALS_USER_OPTS"]])

diff --git a/cmssw_known_errors.py b/cmssw_known_errors.py
@@ -160,7 +160,7 @@
     KNOWN_ERRORS["relvals"][RelFilter][".+_aarch64_.+"]
 )
 
-RelFilter = "CMSSW_[0-9]+_[0-9]+_ASAN_X_.+"
+RelFilter = "CMSSW_[0-9]+_[0-9]+_(.*ASAN.*)_X_.+"
 KNOWN_ERRORS["relvals"][RelFilter] = {}
 KNOWN_ERRORS["relvals"][RelFilter][".+"] = {
     "511.0": {"step": 1, "exitcode": 31744, "reason": MSG_ASAN_INCOMPETIBILITY},

diff --git a/pr_testing/setup-pr-test-env.sh b/pr_testing/setup-pr-test-env.sh
@@ -40,7 +40,7 @@ mkdir -p ${RESULTS_DIR}
 [ "${ARCHITECTURE}" != "" ] && export SCRAM_ARCH=${ARCHITECTURE}
 export SCRAM_PREFIX_PATH=${CMS_BOT_DIR}/das-utils
 case $CMSSW_IB in
-  *_ASAN_* )
+  *ASAN* )
    $CMS_BOT_DIR/system-overrides.sh $WORKSPACE/system-overrides
    export SCRAM_PREFIX_PATH=$WORKSPACE/system-overrides:${SCRAM_PREFIX_PATH}
    ;;

diff --git a/run-ib-testbase.sh b/run-ib-testbase.sh
@@ -38,7 +38,7 @@ fi
 set +x
 #Check for syste commands to override e.g. ps hangs in ASAN env
 case ${RELEASE_FORMAT} in
-  *_ASAN_* )
+  *ASAN* )
    $WORKSPACE/cms-bot/system-overrides.sh $WORKSPACE/system-overrides
    export SCRAM_PREFIX_PATH=$WORKSPACE/system-overrides:\${SCRAM_PREFIX_PATH}
    ;;

diff --git a/runTests.py b/runTests.py
@@ -117,8 +117,8 @@ def run(self):
             return
         precmd = ""
         paralleJobs = MachineCPUCount
-        if ("_ASAN_X" in os.environ["CMSSW_VERSION"]) or (
-            "_UBSAN_X" in os.environ["CMSSW_VERSION"]
+        if ("ASAN" in os.environ["CMSSW_VERSION"]) or (
+            "UBSAN" in os.environ["CMSSW_VERSION"]
         ):
             paralleJobs = int(MachineCPUCount / 2)
         if (self.xType == "GPU") or ("_GPU_X" in os.environ["CMSSW_VERSION"]):