From 067b3ad7824f8ea20734ab3d46c432b1fa43ad8a Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <Shahzad.Malik.Muzaffar@cern.ch>
Date: Thu, 3 Feb 2022 11:16:15 +0100
Subject: [PATCH] [ASAN] Fix unit tests for asan IBs

---
 CommonTools/Utils/test/BuildFile.xml          |  6 ++++++
 CondCore/Utilities/test/BuildFile.xml         |  3 ---
 .../SonicTriton/test/BuildFile.xml            | 21 ++++++++++---------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/CommonTools/Utils/test/BuildFile.xml b/CommonTools/Utils/test/BuildFile.xml
index f010fe6490294..77db466d075e3 100644
--- a/CommonTools/Utils/test/BuildFile.xml
+++ b/CommonTools/Utils/test/BuildFile.xml
@@ -15,6 +15,9 @@
 </bin>
 
 <bin name="testExpressionEvaluator" file="testExpressionEvaluator.cc,testRunner.cpp">
+  <ifrelease name="_ASAN_">
+    <flags NO_TEST_PREFIX="1"/>
+  </ifrelease>
   <use name="Geometry/CommonDetUnit"/>
   <use name="DataFormats/TrackReco"/>
   <use name="DataFormats/TrackerRecHit2D"/>
@@ -29,6 +32,9 @@
 </bin>
 
 <bin file="ExpressionEvaluatorUnitTest.cpp">
+  <ifrelease name="_ASAN_">
+    <flags NO_TEST_PREFIX="1"/>
+  </ifrelease>
   <flags CXXFLAGS="-fopenmp"/>
   <use name="CommonTools/Utils"/>
 </bin>
diff --git a/CondCore/Utilities/test/BuildFile.xml b/CondCore/Utilities/test/BuildFile.xml
index 0dc4f1fceaf69..9cc26ea4f2443 100644
--- a/CondCore/Utilities/test/BuildFile.xml
+++ b/CondCore/Utilities/test/BuildFile.xml
@@ -1,6 +1,3 @@
-<ifrelease name="_ASAN_">
-  <flags NO_TEST_PREFIX="1"/>
-</ifrelease>
 <use name="CondCore/CondDB"/>
 <use name="CondCore/Utilities"/>
 <use name="CondFormats/Common"/>
diff --git a/HeterogeneousCore/SonicTriton/test/BuildFile.xml b/HeterogeneousCore/SonicTriton/test/BuildFile.xml
index 1a02afd61be06..2943bc9931d02 100644
--- a/HeterogeneousCore/SonicTriton/test/BuildFile.xml
+++ b/HeterogeneousCore/SonicTriton/test/BuildFile.xml
@@ -1,10 +1,11 @@
-<environment>
-  <test name="TestHeterogeneousCoreSonicTritonProducerCPU" command="${LOCALTOP}/src/HeterogeneousCore/SonicTriton/test/unittest.sh ${LOCALTOP} CPU"/>
-  <test name="TestHeterogeneousCoreSonicTritonProducerGPU" command="${LOCALTOP}/src/HeterogeneousCore/SonicTriton/test/unittest.sh ${LOCALTOP} GPU"/>
-  <library file="*.cc" name="testHeterogenousCoreSonicTriton">
-    <flags EDM_PLUGIN="1"/>
-    <use name="FWCore/ParameterSet"/>
-    <use name="FWCore/Framework"/>
-    <use name="HeterogeneousCore/SonicTriton"/>
-  </library>
-</environment>
+<ifrelease name="_ASAN_|_UBSAN_">
+  <flags NO_TEST_PREFIX="1"/>
+</ifrelease>
+<test name="TestHeterogeneousCoreSonicTritonProducerCPU" command="${LOCALTOP}/src/HeterogeneousCore/SonicTriton/test/unittest.sh ${LOCALTOP} CPU"/>
+<test name="TestHeterogeneousCoreSonicTritonProducerGPU" command="${LOCALTOP}/src/HeterogeneousCore/SonicTriton/test/unittest.sh ${LOCALTOP} GPU"/>
+<library file="*.cc" name="testHeterogenousCoreSonicTriton">
+  <flags EDM_PLUGIN="1"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/Framework"/>
+  <use name="HeterogeneousCore/SonicTriton"/>
+</library>