split tsan and asan check

Signed-off-by: asingh-g <[email protected]>

Author: asingh-g

test/integration/integration_test.py

@@ -35,7 +35,7 @@
       plugins=["xdist"])
   if (r != 0):
     exit(r)
-  if not utility.isSanitizerRun():
+  if not utility.isTsanRun():
     r = pytest.main(
         [
             "--rootdir=" + path,

test/integration/utility.py

@@ -33,13 +33,31 @@ def parseUrisToSocketAddress(uris: list[str]) -> list[SocketAddress]:
   return addresses
 
 
+def isTsanRun():
+  """Determine if current execution is tsan.
+
+  Returns:
+      bool: True iff the current execution is determined to be a sanitizer run.
+  """
+  return True if os.environ.get("NH_INTEGRATION_TEST_THREAD_SANITIZER_RUN", 0) == "1" else False
+
+
+def isAsanRun():
+  """Determine if current execution is asan.
+
+  Returns:
+      bool: True iff the current execution is determined to be a sanitizer run.
+  """
+  return True if os.environ.get("NH_INTEGRATION_TEST_ADDRESS_SANITIZER_RUN", 0) == "1" else False
+
+
 def isSanitizerRun():
   """Determine if the current execution is a tsan/asan/ubsan run.
 
   Returns:
       bool: True iff the current execution is determined to be a sanitizer run.
   """
-  return True if os.environ.get("NH_INTEGRATION_TEST_SANITIZER_RUN", 0) == "1" else False
+  return True if isTsanRun() or isAsanRun() else False
 
 
 def run_binary_with_args(binary, args):

test/python_test.cc

@@ -13,8 +13,13 @@ class PythonTest : public Test {};
 // of getting code coverage reporting to also consider the code hit by integration tests.
 TEST_F(PythonTest, IntegrationTests) {
   const std::string path = TestEnvironment::runfilesPath("test/integration/integration_test");
-#if defined(__has_feature) && (__has_feature(thread_sanitizer) || __has_feature(address_sanitizer))
-  char env[] = "NH_INTEGRATION_TEST_SANITIZER_RUN=1";
+#if defined(__has_feature) && (__has_feature(address_sanitizer))
+  char env[] = "NH_INTEGRATION_TEST_ADDRESS_SANITIZER_RUN=1";
+  putenv(env);
+#endif
+
+#if defined(__has_feature) && (__has_feature(thread_sanitizer))
+  char env[] = "NH_INTEGRATION_TEST_THREAD_SANITIZER_RUN=1";
   putenv(env);
 #endif
   ASSERT_EQ(0, system(path.c_str()));