Linux musl: corrections for aligned_alloc test

diff --git a/memcheck/tests/linux/Makefile.am b/memcheck/tests/linux/Makefile.am
index 895f76ed69041f8ea5d98356d9098bd3c060dcaa..af88e8cb6f23ae3181b63192698207b799481a9e 100644 (file)
--- a/memcheck/tests/linux/Makefile.am
+++ b/memcheck/tests/linux/Makefile.am
@@ -38,6 +38,7 @@ EXTRA_DIST = \
        memalign.vgtest memalign.stderr.exp
 
 check_PROGRAMS = \
+       aligned_alloc \
        brk \
        capget \
        check_preadv2_pwritev2 \

diff --git a/memcheck/tests/linux/aligned_alloc.c b/memcheck/tests/linux/aligned_alloc.c
index 15955ff84517454b874c4ecac688848510cb0a4a..0cffe085b334e6ce6adce906b477998652a69af9 100644 (file)
--- a/memcheck/tests/linux/aligned_alloc.c
+++ b/memcheck/tests/linux/aligned_alloc.c
@@ -11,8 +11,8 @@ int main(void)
 
    // zero size
    p = aligned_alloc(0, 8);
-   assert(p == NULL && errno == EINVAL);
-   errno = 0;
+   assert(p && ((size_t)p % 8U == 0U));
+   free(p);
    // non multiple of alignment passes on FreeBSD
    p = aligned_alloc(8, 25);
    assert(p && ((size_t)p % 8U == 0U));
@@ -20,7 +20,7 @@ int main(void)
    //errno = 0;
    // align not power of 2
    p = aligned_alloc(40, 160);
-   assert(p == NULL && errno == EINVAL);
+   assert(p == NULL);
    errno = 0;
    // the test below causes a segfault with musl 1.2.2
    // apparently it has been fixed in 1.2.3

diff --git a/memcheck/tests/linux/aligned_alloc.vgtest b/memcheck/tests/linux/aligned_alloc.vgtest
index 07c1c4faf7a281a0d54cf316a19fcd4478c4778b..a20bccb007b8ece978e8215bddbc06eb27bd1f47 100644 (file)
--- a/memcheck/tests/linux/aligned_alloc.vgtest
+++ b/memcheck/tests/linux/aligned_alloc.vgtest
@@ -1 +1,2 @@
 prog: aligned_alloc
+vgopts: -q