Replace local MUSL define with global ANDROID_HOST_MUSL
Bug: 190084016
Test: m USE_HOST_MUSL=true bionic-unit-tests-glibc
Change-Id: I56b23576cb24912112d2ae56d8ecc2e3716982fe
diff --git a/tests/math_test.cpp b/tests/math_test.cpp
index c53741c..76b5078 100644
--- a/tests/math_test.cpp
+++ b/tests/math_test.cpp
@@ -62,6 +62,7 @@
#include <float.h>
#include <limits.h>
#include <stdint.h>
+#include <sys/cdefs.h>
#include <android-base/scopeguard.h>
@@ -201,7 +202,7 @@
}
TEST(MATH_TEST, __fpclassifyd) {
-#if defined(__GLIBC__) || defined(MUSL)
+#if defined(__GLIBC__) || defined(ANDROID_HOST_MUSL)
#define __fpclassifyd __fpclassify
#endif
ASSERT_EQ(FP_INFINITE, __fpclassifyd(HUGE_VAL));
@@ -246,7 +247,7 @@
TEST(MATH_TEST, __isfinite) {
#if defined(__GLIBC__)
#define __isfinite __finite
-#elif defined(MUSL)
+#elif defined(ANDROID_HOST_MUSL)
#define __isfinite isfinite
#endif
ASSERT_TRUE(__isfinite(123.0));
@@ -257,7 +258,7 @@
TEST(MATH_TEST, __isfinitef) {
#if defined(__GLIBC__)
#define __isfinitef __finitef
-#elif defined(MUSL)
+#elif defined(ANDROID_HOST_MUSL)
#define __isfinitef isfinite
#endif
ASSERT_TRUE(__isfinitef(123.0f));
@@ -268,7 +269,7 @@
TEST(MATH_TEST, isfinitef) {
#if defined(__GLIBC__)
#define isfinitef __finitef
-#elif defined(MUSL)
+#elif defined(ANDROID_HOST_MUSL)
#define isfinitef isfinite
#endif
ASSERT_TRUE(isfinitef(123.0f));
@@ -279,7 +280,7 @@
TEST(MATH_TEST, __isfinitel) {
#if defined(__GLIBC__)
#define __isfinitel __finitel
-#elif defined(MUSL)
+#elif defined(ANDROID_HOST_MUSL)
#define __isfinitel isfinite
#endif
ASSERT_TRUE(__isfinitel(123.0L));
@@ -290,7 +291,7 @@
TEST(MATH_TEST, isfinitel) {
#if defined(__GLIBC__)
#define isfinitel __finitel
-#elif defined(MUSL)
+#elif defined(ANDROID_HOST_MUSL)
#define isfinitel isfinite
#endif
ASSERT_TRUE(isfinitel(123.0L));
@@ -319,7 +320,7 @@
extern "C" int isinfl(long double);
TEST(MATH_TEST, __isinf) {
-#if defined(MUSL)
+#if defined(ANDROID_HOST_MUSL)
#define __isinf isinf
#endif
ASSERT_FALSE(__isinf(123.0));
@@ -328,7 +329,7 @@
}
TEST(MATH_TEST, __isinff) {
-#if defined(MUSL)
+#if defined(ANDROID_HOST_MUSL)
#define __isinff isinf
#endif
ASSERT_FALSE(__isinff(123.0f));
@@ -337,7 +338,7 @@
}
TEST(MATH_TEST, isinff) {
-#if defined(MUSL)
+#if defined(ANDROID_HOST_MUSL)
#define isinff isinf
#endif
ASSERT_FALSE(isinff(123.0f));
@@ -346,7 +347,7 @@
}
TEST(MATH_TEST, __isinfl) {
-#if defined(MUSL)
+#if defined(ANDROID_HOST_MUSL)
#define __isinfl isinf
#endif
ASSERT_FALSE(__isinfl(123.0L));
@@ -355,7 +356,7 @@
}
TEST(MATH_TEST, isinfl) {
-#if defined(MUSL)
+#if defined(ANDROID_HOST_MUSL)
#define isinfl isinf
#endif
ASSERT_FALSE(isinfl(123.0L));
@@ -377,7 +378,7 @@
extern "C" int isnanl(long double);
TEST(MATH_TEST, __isnan) {
-#if defined(MUSL)
+#if defined(ANDROID_HOST_MUSL)
#define __isnan isnan
#endif
ASSERT_FALSE(__isnan(123.0));
@@ -385,7 +386,7 @@
}
TEST(MATH_TEST, __isnanf) {
-#if defined(MUSL)
+#if defined(ANDROID_HOST_MUSL)
#define __isnanf isnan
#endif
ASSERT_FALSE(__isnanf(123.0f));
@@ -393,7 +394,7 @@
}
TEST(MATH_TEST, isnanf) {
-#if defined(MUSL)
+#if defined(ANDROID_HOST_MUSL)
#define isnanf isnan
#endif
ASSERT_FALSE(isnanf(123.0f));
@@ -401,7 +402,7 @@
}
TEST(MATH_TEST, __isnanl) {
-#if defined(MUSL)
+#if defined(ANDROID_HOST_MUSL)
#define __isnanl isnan
#endif
ASSERT_FALSE(__isnanl(123.0L));
@@ -409,7 +410,7 @@
}
TEST(MATH_TEST, isnanl) {
-#if defined(MUSL)
+#if defined(ANDROID_HOST_MUSL)
#define isnanl isnan
#endif
ASSERT_FALSE(isnanl(123.0L));
@@ -1385,7 +1386,7 @@
}
TEST(MATH_TEST, significandl) {
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
ASSERT_DOUBLE_EQ(0.0L, significandl(0.0L));
ASSERT_DOUBLE_EQ(1.2L, significandl(1.2L));
ASSERT_DOUBLE_EQ(1.53125L, significandl(12.25L));
@@ -1428,7 +1429,7 @@
}
TEST(MATH_TEST, gamma) {
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
ASSERT_DOUBLE_EQ(log(24.0), gamma(5.0));
#else
GTEST_SKIP() << "musl doesn't have gamma";
@@ -1436,7 +1437,7 @@
}
TEST(MATH_TEST, gammaf) {
-#if !defined(MUSL)
+#if !defined(ANDROID_HOST_MUSL)
ASSERT_FLOAT_EQ(logf(24.0f), gammaf(5.0f));
#else
GTEST_SKIP() << "musl doesn't have gammaf";