[scudo][gwp_asan] Clean up Fuchsia zxtest framework integration

[frobtech]

This brings the scudo and gwp_asan code in line with how the
llvm-libc code selects using zxtest vs gtest on Fuchsia.

[llvmbot]

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Roland McGrath (frobtech)

Changes

When the characteristics of a procedure depend on a procedure that
hasn't yet been defined, the compiler currently emits an unconditional
error message. This includes the case of a procedure whose
characteristics depend, perhaps indirectly, on itself. However, in the
case where the characteristics of a procedure are needed to resolve a
generic, we should not emit an error for a hitherto undefined procedure
-- either the call will resolve to another specific procedure, in which
case the error is spurious, or it won't, and then an error will issue
anyway.

Fixes #88677.

---

Full diff: https://github.com/llvm/llvm-project/pull/90015.diff

2 Files Affected:

• (modified) compiler-rt/lib/gwp_asan/tests/harness.h (+1-1)
• (modified) compiler-rt/lib/scudo/standalone/tests/scudo_unit_test.h (+1-1)

diff --git a/compiler-rt/lib/gwp_asan/tests/harness.h b/compiler-rt/lib/gwp_asan/tests/harness.h
index ae39a443bd0a09..205a0250329e4f 100644
--- a/compiler-rt/lib/gwp_asan/tests/harness.h
+++ b/compiler-rt/lib/gwp_asan/tests/harness.h
@@ -11,7 +11,7 @@
 
 #include <stdarg.h>
 
-#if defined(__Fuchsia__)
+#ifdef LIBC_COPT_TEST_USE_ZXTEST
 #define ZXTEST_USE_STREAMABLE_MACROS
 #include <zxtest/zxtest.h>
 namespace testing = zxtest;
diff --git a/compiler-rt/lib/scudo/standalone/tests/scudo_unit_test.h b/compiler-rt/lib/scudo/standalone/tests/scudo_unit_test.h
index 4283416435ba0c..1a911d2d8dff44 100644
--- a/compiler-rt/lib/scudo/standalone/tests/scudo_unit_test.h
+++ b/compiler-rt/lib/scudo/standalone/tests/scudo_unit_test.h
@@ -8,7 +8,7 @@
 
 #include "platform.h"
 
-#if SCUDO_FUCHSIA
+#ifdef LIBC_COPT_TEST_USE_ZXTEST
 #include <zxtest/zxtest.h>
 using Test = ::zxtest::Test;
 #else

[fabio-d]

LGTM with comments

[fabio-d]

At line 48 too?

[fabio-d]

Since this is removing the only occurrence of "Fuchsia" in this file, I'm wondering if we could leave some breadcrumb comment that ties zxtest back to Fuchsia like you did in libc/test/UnitTest/Test.h, for the benefit of those who don't know what zxtest is