[compiler-rt] 6994bf7 - [NFC][scudo] Move SKIP_ON_FUCHSIA to common header

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2021-05-22T22:42:59-07:00
New Revision: 6994bf7dadf575234a46e831194a00d01b22b2a8

URL: https://github.com/llvm/llvm-project/commit/6994bf7dadf575234a46e831194a00d01b22b2a8
DIFF: https://github.com/llvm/llvm-project/commit/6994bf7dadf575234a46e831194a00d01b22b2a8.diff

LOG: [NFC][scudo] Move SKIP_ON_FUCHSIA to common header

Added: 
    

Modified: 
    compiler-rt/lib/scudo/standalone/tests/combined_test.cpp
    compiler-rt/lib/scudo/standalone/tests/scudo_unit_test.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/scudo/standalone/tests/combined_test.cpp b/compiler-rt/lib/scudo/standalone/tests/combined_test.cpp
index 31c0e366d9346..59841ac424b73 100644
--- a/compiler-rt/lib/scudo/standalone/tests/combined_test.cpp
+++ b/compiler-rt/lib/scudo/standalone/tests/combined_test.cpp
@@ -491,12 +491,6 @@ SCUDO_TYPED_TEST(ScudoCombinedTest, ThreadedCombined) {
   Allocator->releaseToOS();
 }
 
-#if SCUDO_FUCHSIA
-#define SKIP_ON_FUCHSIA(T) DISABLED_##T
-#else
-#define SKIP_ON_FUCHSIA(T) T
-#endif
-
 // Test that multiple instantiations of the allocator have not messed up the
 // process's signal handlers (GWP-ASan used to do this).
 TEST(ScudoCombinedTest, SKIP_ON_FUCHSIA(testSEGV)) {

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 555a935254ca5..7b8218a1b28e2 100644
--- a/compiler-rt/lib/scudo/standalone/tests/scudo_unit_test.h
+++ b/compiler-rt/lib/scudo/standalone/tests/scudo_unit_test.h
@@ -33,4 +33,10 @@ using Test = ::testing::Test;
 #define EXPECT_STREQ(X, Y) EXPECT_EQ(strcmp(X, Y), 0)
 #endif
 
+#if SCUDO_FUCHSIA
+#define SKIP_ON_FUCHSIA(T) DISABLED_##T
+#else
+#define SKIP_ON_FUCHSIA(T) T
+#endif
+
 extern bool UseQuarantine;