commit 4c5595c968a1cf2211edfb2817009af6d5bc0522
author Colin Cross <ccross@android.com> Mon Aug 16 15:51:59 2021 -0700
committer Colin Cross <ccross@android.com> Mon Aug 16 16:44:24 2021 -0700
tree 1bf81f53721d1fab5f1bd0cbe6c2e1d5c6274616
parent 14d15076199992f71997a1147f41bdfc2fd192ef

Replace local MUSL define with global ANDROID_HOST_MUSL

Bug: 190084016
Test: m USE_HOST_MUSL=true bionic-unit-tests-glibc
Change-Id: I56b23576cb24912112d2ae56d8ecc2e3716982fe

tests/spawn_test.cpp

diff --git a/tests/spawn_test.cpp b/tests/spawn_test.cpp
index 3309466..f3c5b9a 100644
--- a/tests/spawn_test.cpp
+++ b/tests/spawn_test.cpp
@@ -18,6 +18,8 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <sys/cdefs.h>
+
 #include <gtest/gtest.h>
 
 #include "SignalUtils.h"
@@ -379,7 +381,7 @@
 }
 
 TEST(spawn, posix_spawn_POSIX_SPAWN_SETSIGMASK) {
-#if defined(__GLIBC__) || defined(MUSL)
+#if defined(__GLIBC__) || defined(ANDROID_HOST_MUSL)
   GTEST_SKIP() << "glibc doesn't ignore the same signals.";
 #else
   // Block SIGBUS in the parent...
@@ -417,7 +419,7 @@
 }
 
 TEST(spawn, posix_spawn_POSIX_SPAWN_SETSIGDEF) {
-#if defined(__GLIBC__) || defined(MUSL)
+#if defined(__GLIBC__) || defined(ANDROID_HOST_MUSL)
   GTEST_SKIP() << "glibc doesn't ignore the same signals.";
 #else
   // Ignore SIGALRM and SIGCONT in the parent...