[compiler-rt] 478648e - [gwp_asan] Soft-transition ZXTEST_USE_STREAMABLE_MACROS removal (#121887)

[via llvm-commits]

Author: Caslyn Tonelli
Date: 2025-01-07T10:03:31-08:00
New Revision: 478648e2c0adbafa5e4cb10eb53aadbdf7de97d9

URL: https://github.com/llvm/llvm-project/commit/478648e2c0adbafa5e4cb10eb53aadbdf7de97d9
DIFF: https://github.com/llvm/llvm-project/commit/478648e2c0adbafa5e4cb10eb53aadbdf7de97d9.diff

LOG: [gwp_asan] Soft-transition ZXTEST_USE_STREAMABLE_MACROS removal (#121887)

Soft-transition the removal of setting ZXTEST_USE_STREAMABLE_MACROS, by
only setting the macro if not already defined. A future PR will remove
setting the macro entirely in harness.h.

Added: 
    

Modified: 
    compiler-rt/lib/gwp_asan/tests/harness.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/gwp_asan/tests/harness.h b/compiler-rt/lib/gwp_asan/tests/harness.h
index c96f846996d353..3fbcf991c5592f 100644
--- a/compiler-rt/lib/gwp_asan/tests/harness.h
+++ b/compiler-rt/lib/gwp_asan/tests/harness.h
@@ -12,7 +12,9 @@
 #include <stdarg.h>
 
 #if defined(__Fuchsia__)
+#ifndef ZXTEST_USE_STREAMABLE_MACROS
 #define ZXTEST_USE_STREAMABLE_MACROS
+#endif
 #include <zxtest/zxtest.h>
 namespace testing = zxtest;
 // zxtest defines a 
diff erent ASSERT_DEATH, taking a lambda and an error message