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/wchar_test.cpp

diff --git a/tests/wchar_test.cpp b/tests/wchar_test.cpp
index 218c724..85a75ec 100644
--- a/tests/wchar_test.cpp
+++ b/tests/wchar_test.cpp
@@ -22,6 +22,7 @@
 #include <locale.h>
 #include <math.h>
 #include <stdint.h>
+#include <sys/cdefs.h>
 #include <wchar.h>
 
 #include "utils.h"
@@ -800,7 +801,7 @@
 }
 
 TEST(wchar, wmempcpy) {
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
   wchar_t dst[6];
   ASSERT_EQ(&dst[4], wmempcpy(dst, L"hello", 4));
 #else
@@ -917,7 +918,7 @@
 }
 
 TEST(wchar, wcstod_l) {
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
   EXPECT_EQ(1.23, wcstod_l(L"1.23", nullptr, LC_GLOBAL_LOCALE));
 #else
   GTEST_SKIP() << "musl doesn't have wcstod_l";
@@ -925,7 +926,7 @@
 }
 
 TEST(wchar, wcstof_l) {
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
   EXPECT_EQ(1.23f, wcstof_l(L"1.23", nullptr, LC_GLOBAL_LOCALE));
 #else
   GTEST_SKIP() << "musl doesn't have wcstof_l";
@@ -933,7 +934,7 @@
 }
 
 TEST(wchar, wcstol_l) {
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
   EXPECT_EQ(123L, wcstol_l(L"123", nullptr, 10, LC_GLOBAL_LOCALE));
 #else
   GTEST_SKIP() << "musl doesn't have wcstol_l";
@@ -949,7 +950,7 @@
 }
 
 TEST(wchar, wcstoul_l) {
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
   EXPECT_EQ(123UL, wcstoul_l(L"123", nullptr, 10, LC_GLOBAL_LOCALE));
 #else
   GTEST_SKIP() << "musl doesn't have wcstoul_l";