From be34d5f74afe8347b8b6110cb209186caf07e16b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Mon, 31 May 2021 10:01:59 +0000 Subject: [PATCH] [libcxx] [test] Remove an incorrect TEST_HAS_ALIGNED_ALLOC define from test_macros.h This was added inconsistently in 19fd9039ca242f408493b5c662f9d908eab8555e; Windows doesn't have the aligned_alloc function (neither MSVC nor MinGW toolchains) and we don't define _LIBCPP_HAS_ALIGNED_ALLOC while building libcxx. Differential Revision: https://reviews.llvm.org/D103399 --- libcxx/test/libcxx/language.support/has_aligned_alloc.compile.pass.cpp | 2 -- libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp | 2 -- libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp | 2 -- libcxx/test/support/test_macros.h | 1 - 4 files changed, 7 deletions(-) diff --git a/libcxx/test/libcxx/language.support/has_aligned_alloc.compile.pass.cpp b/libcxx/test/libcxx/language.support/has_aligned_alloc.compile.pass.cpp index 5e86371..d1b41de 100644 --- a/libcxx/test/libcxx/language.support/has_aligned_alloc.compile.pass.cpp +++ b/libcxx/test/libcxx/language.support/has_aligned_alloc.compile.pass.cpp @@ -8,8 +8,6 @@ // UNSUPPORTED: c++03, c++11, c++14 -// XFAIL: LIBCXX-WINDOWS-FIXME - // Make sure TEST_HAS_ALIGNED_ALLOC (defined by the test suite) and // _LIBCPP_HAS_ALIGNED_ALLOC (defined by libc++) stay in sync. diff --git a/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp b/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp index 8dd15c9..295f518 100644 --- a/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp +++ b/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp @@ -8,8 +8,6 @@ // test -// XFAIL: LIBCXX-WINDOWS-FIXME - #include #include #include diff --git a/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp b/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp index f2ff89d..668213f8 100644 --- a/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp +++ b/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp @@ -8,8 +8,6 @@ // test -// XFAIL: LIBCXX-WINDOWS-FIXME - #include #include #include diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h index 4bd3d55..3d8f933 100644 --- a/libcxx/test/support/test_macros.h +++ b/libcxx/test/support/test_macros.h @@ -209,7 +209,6 @@ # elif defined(_WIN32) # if defined(_MSC_VER) && !defined(__MINGW32__) # define TEST_HAS_QUICK_EXIT -# define TEST_HAS_ALIGNED_ALLOC # define TEST_HAS_TIMESPEC_GET # endif # elif defined(__APPLE__) -- 2.7.4