From 7da20341e91a4ece30f628fb91fbc6056c9c8a7c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 28 Jul 2021 11:18:11 -0700 Subject: Build bionic unit tests for musl Modify bionic unit tests that are built for glibc so that they also build against musl. They don't all pass though: With glibc: 2 SLOW TESTS 4 TIMEOUT TESTS 313 FAILED TESTS YOU HAVE 2 DISABLED TESTS With musl: 11 SLOW TESTS 11 TIMEOUT TESTS 363 FAILED TESTS YOU HAVE 2 DISABLED TESTS Bug: 190084016 Test: m bionic-unit-tests-glibc with musl Test: atest bionic-unit-tests-static Test: atest --host bionic-unit-tests-glibc with glibc Change-Id: I79b6eab04fed3cc4392450df5eef2579412edfe1 --- tests/malloc_test.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'tests/malloc_test.cpp') diff --git a/tests/malloc_test.cpp b/tests/malloc_test.cpp index 30da5c32f..f15fc75d5 100644 --- a/tests/malloc_test.cpp +++ b/tests/malloc_test.cpp @@ -55,10 +55,14 @@ #define HAVE_REALLOCARRAY 1 -#else +#elif defined(__GLIBC__) #define HAVE_REALLOCARRAY __GLIBC_PREREQ(2, 26) +#elif defined(MUSL) + +#define HAVE_REALLOCARRAY 1 + #endif TEST(malloc, malloc_std) { @@ -655,10 +659,14 @@ TEST(malloc, verify_alignment) { } TEST(malloc, mallopt_smoke) { +#if !defined(MUSL) errno = 0; ASSERT_EQ(0, mallopt(-1000, 1)); // mallopt doesn't set errno. ASSERT_EQ(0, errno); +#else + GTEST_SKIP() << "musl doesn't have mallopt"; +#endif } TEST(malloc, mallopt_decay) { -- cgit v1.2.3