From 9fdc63a61cd5c96c733c8e7da3044d00d1eea742 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 8 May 2014 10:31:38 -0700 Subject: [PATCH] Disables tests that fail to compile math_h, cmath: Fails a static assert because isnan(double) and isinf(double) should be returning bool, but aren't. This is a known problem upstream. http://libcxx.llvm.org/results.Linux.html uchar_h, cuchar, version_cuchar: Bionic does not include this header. According to upstream, this was also a problem with glibc last time they ran their tests. Docs say this is fixed in glibc 2.16. http://libcxx.llvm.org/results.Linux.html wctype_h, cwctype: This one isn't disabled, but did require a fix. The test was casting 0 directly to a wctype_t, which fails because bionic's wctype_t is an enum. From the POSIX spec, it looks like bionic is allowed to do so, and this test should be fixed upstream. cstdio: snprintf is a macro in bionic, which make it impossible for to ::using snprintf. There may be a work around for this. quick_exit: Bionic supports this, but glibc does not. Also becomes available in glibc 2.16. http://libcxx.llvm.org/results.Linux.html max_align_t: Needs investigation. aligned_storage: Needs investigation. Change-Id: I62a5210f6755388dc06cce20d81530a300300bf1 --- test/depr/depr.c.headers/Android.mk | 10 +--------- .../{math_h.pass.cpp => math_h.disabled.cpp} | 0 .../{uchar_h.pass.cpp => uchar_h.disabled.cpp} | 0 test/depr/depr.c.headers/wctype_h.pass.cpp | 2 +- test/input.output/file.streams/c.files/Android.mk | 6 +----- .../c.files/{cstdio.pass.cpp => cstdio.disabled.cpp} | 0 test/language.support/support.start.term/Android.mk | 6 +----- .../{quick_exit.pass.cpp => quick_exit.disabled.cpp} | 0 test/language.support/support.types/Android.mk | 6 +----- .../{max_align_t.pass.cpp => max_align_t.disabled.cpp} | 0 test/numerics/c.math/Android.mk | 6 +----- .../c.math/{cmath.pass.cpp => cmath.disabled.cpp} | 0 test/strings/c.strings/Android.mk | 10 +--------- .../c.strings/{cuchar.pass.cpp => cuchar.disabled.cpp} | 0 test/strings/c.strings/cwctype.pass.cpp | 2 +- ...ion_cuchar.pass.cpp => version_cuchar.disabled.cpp} | 0 .../meta/meta.trans/meta.trans.other/Android.mk | 6 +----- ...d_storage.pass.cpp => aligned_storage.disabled.cpp} | 0 18 files changed, 9 insertions(+), 45 deletions(-) rename test/depr/depr.c.headers/{math_h.pass.cpp => math_h.disabled.cpp} (100%) rename test/depr/depr.c.headers/{uchar_h.pass.cpp => uchar_h.disabled.cpp} (100%) rename test/input.output/file.streams/c.files/{cstdio.pass.cpp => cstdio.disabled.cpp} (100%) rename test/language.support/support.start.term/{quick_exit.pass.cpp => quick_exit.disabled.cpp} (100%) rename test/language.support/support.types/{max_align_t.pass.cpp => max_align_t.disabled.cpp} (100%) rename test/numerics/c.math/{cmath.pass.cpp => cmath.disabled.cpp} (100%) rename test/strings/c.strings/{cuchar.pass.cpp => cuchar.disabled.cpp} (100%) rename test/strings/c.strings/{version_cuchar.pass.cpp => version_cuchar.disabled.cpp} (100%) rename test/utilities/meta/meta.trans/meta.trans.other/{aligned_storage.pass.cpp => aligned_storage.disabled.cpp} (100%) diff --git a/test/depr/depr.c.headers/Android.mk b/test/depr/depr.c.headers/Android.mk index 6998bdded..d0670a63e 100644 --- a/test/depr/depr.c.headers/Android.mk +++ b/test/depr/depr.c.headers/Android.mk @@ -20,10 +20,6 @@ test_name := depr/depr.c.headers/stdarg_h test_src := stdarg_h.pass.cpp include external/libcxx/test/Android.build.mk -test_name := depr/depr.c.headers/uchar_h -test_src := uchar_h.pass.cpp -include external/libcxx/test/Android.build.mk - test_name := depr/depr.c.headers/string_h test_src := string_h.pass.cpp include external/libcxx/test/Android.build.mk @@ -88,10 +84,6 @@ test_name := depr/depr.c.headers/signal_h test_src := signal_h.pass.cpp include external/libcxx/test/Android.build.mk -test_name := depr/depr.c.headers/math_h -test_src := math_h.pass.cpp -include external/libcxx/test/Android.build.mk - test_name := depr/depr.c.headers/stdio_h test_src := stdio_h.pass.cpp include external/libcxx/test/Android.build.mk @@ -120,4 +112,4 @@ test_name := depr/depr.c.headers/fenv_h test_src := fenv_h.pass.cpp include external/libcxx/test/Android.build.mk -include $(call all-makefiles-under,$(LOCAL_PATH)) \ No newline at end of file +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/test/depr/depr.c.headers/math_h.pass.cpp b/test/depr/depr.c.headers/math_h.disabled.cpp similarity index 100% rename from test/depr/depr.c.headers/math_h.pass.cpp rename to test/depr/depr.c.headers/math_h.disabled.cpp diff --git a/test/depr/depr.c.headers/uchar_h.pass.cpp b/test/depr/depr.c.headers/uchar_h.disabled.cpp similarity index 100% rename from test/depr/depr.c.headers/uchar_h.pass.cpp rename to test/depr/depr.c.headers/uchar_h.disabled.cpp diff --git a/test/depr/depr.c.headers/wctype_h.pass.cpp b/test/depr/depr.c.headers/wctype_h.pass.cpp index ad3107100..f7f36f521 100644 --- a/test/depr/depr.c.headers/wctype_h.pass.cpp +++ b/test/depr/depr.c.headers/wctype_h.pass.cpp @@ -92,7 +92,7 @@ int main() { wint_t w = 0; wctrans_t wctr = 0; - wctype_t wct = 0; + wctype_t wct = (wctype_t)0; static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); diff --git a/test/input.output/file.streams/c.files/Android.mk b/test/input.output/file.streams/c.files/Android.mk index 154b21b83..1476fb4c9 100644 --- a/test/input.output/file.streams/c.files/Android.mk +++ b/test/input.output/file.streams/c.files/Android.mk @@ -28,8 +28,4 @@ test_name := input.output/file.streams/c.files/version_ccstdio test_src := version_ccstdio.pass.cpp include external/libcxx/test/Android.build.mk -test_name := input.output/file.streams/c.files/cstdio -test_src := cstdio.pass.cpp -include external/libcxx/test/Android.build.mk - -include $(call all-makefiles-under,$(LOCAL_PATH)) \ No newline at end of file +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/test/input.output/file.streams/c.files/cstdio.pass.cpp b/test/input.output/file.streams/c.files/cstdio.disabled.cpp similarity index 100% rename from test/input.output/file.streams/c.files/cstdio.pass.cpp rename to test/input.output/file.streams/c.files/cstdio.disabled.cpp diff --git a/test/language.support/support.start.term/Android.mk b/test/language.support/support.start.term/Android.mk index 753081f6f..1b7fdad3f 100644 --- a/test/language.support/support.start.term/Android.mk +++ b/test/language.support/support.start.term/Android.mk @@ -16,8 +16,4 @@ LOCAL_PATH := $(call my-dir) test_makefile := external/libcxx/test/language.support/support.start.term/Android.mk -test_name := language.support/support.start.term/quick_exit -test_src := quick_exit.pass.cpp -include external/libcxx/test/Android.build.mk - -include $(call all-makefiles-under,$(LOCAL_PATH)) \ No newline at end of file +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/test/language.support/support.start.term/quick_exit.pass.cpp b/test/language.support/support.start.term/quick_exit.disabled.cpp similarity index 100% rename from test/language.support/support.start.term/quick_exit.pass.cpp rename to test/language.support/support.start.term/quick_exit.disabled.cpp diff --git a/test/language.support/support.types/Android.mk b/test/language.support/support.types/Android.mk index 31a892fce..d8fe88eb8 100644 --- a/test/language.support/support.types/Android.mk +++ b/test/language.support/support.types/Android.mk @@ -24,10 +24,6 @@ test_name := language.support/support.types/size_t test_src := size_t.pass.cpp include external/libcxx/test/Android.build.mk -test_name := language.support/support.types/max_align_t -test_src := max_align_t.pass.cpp -include external/libcxx/test/Android.build.mk - test_name := language.support/support.types/version test_src := version.pass.cpp include external/libcxx/test/Android.build.mk @@ -44,4 +40,4 @@ test_name := language.support/support.types/nullptr_t test_src := nullptr_t.pass.cpp include external/libcxx/test/Android.build.mk -include $(call all-makefiles-under,$(LOCAL_PATH)) \ No newline at end of file +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/test/language.support/support.types/max_align_t.pass.cpp b/test/language.support/support.types/max_align_t.disabled.cpp similarity index 100% rename from test/language.support/support.types/max_align_t.pass.cpp rename to test/language.support/support.types/max_align_t.disabled.cpp diff --git a/test/numerics/c.math/Android.mk b/test/numerics/c.math/Android.mk index d28ffc388..d40a0b473 100644 --- a/test/numerics/c.math/Android.mk +++ b/test/numerics/c.math/Android.mk @@ -28,8 +28,4 @@ test_name := numerics/c.math/version_cmath test_src := version_cmath.pass.cpp include external/libcxx/test/Android.build.mk -test_name := numerics/c.math/cmath -test_src := cmath.pass.cpp -include external/libcxx/test/Android.build.mk - -include $(call all-makefiles-under,$(LOCAL_PATH)) \ No newline at end of file +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/test/numerics/c.math/cmath.pass.cpp b/test/numerics/c.math/cmath.disabled.cpp similarity index 100% rename from test/numerics/c.math/cmath.pass.cpp rename to test/numerics/c.math/cmath.disabled.cpp diff --git a/test/strings/c.strings/Android.mk b/test/strings/c.strings/Android.mk index 4280fe09f..638e61c53 100644 --- a/test/strings/c.strings/Android.mk +++ b/test/strings/c.strings/Android.mk @@ -36,10 +36,6 @@ test_name := strings/c.strings/cstring test_src := cstring.pass.cpp include external/libcxx/test/Android.build.mk -test_name := strings/c.strings/version_cuchar -test_src := version_cuchar.pass.cpp -include external/libcxx/test/Android.build.mk - test_name := strings/c.strings/version_cwchar test_src := version_cwchar.pass.cpp include external/libcxx/test/Android.build.mk @@ -52,8 +48,4 @@ test_name := strings/c.strings/version_cstring test_src := version_cstring.pass.cpp include external/libcxx/test/Android.build.mk -test_name := strings/c.strings/cuchar -test_src := cuchar.pass.cpp -include external/libcxx/test/Android.build.mk - -include $(call all-makefiles-under,$(LOCAL_PATH)) \ No newline at end of file +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/test/strings/c.strings/cuchar.pass.cpp b/test/strings/c.strings/cuchar.disabled.cpp similarity index 100% rename from test/strings/c.strings/cuchar.pass.cpp rename to test/strings/c.strings/cuchar.disabled.cpp diff --git a/test/strings/c.strings/cwctype.pass.cpp b/test/strings/c.strings/cwctype.pass.cpp index 6d66415ab..9d99cbf42 100644 --- a/test/strings/c.strings/cwctype.pass.cpp +++ b/test/strings/c.strings/cwctype.pass.cpp @@ -92,7 +92,7 @@ int main() { std::wint_t w = 0; std::wctrans_t wctr = 0; - std::wctype_t wct = 0; + std::wctype_t wct = (std::wctype_t)0; static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); diff --git a/test/strings/c.strings/version_cuchar.pass.cpp b/test/strings/c.strings/version_cuchar.disabled.cpp similarity index 100% rename from test/strings/c.strings/version_cuchar.pass.cpp rename to test/strings/c.strings/version_cuchar.disabled.cpp diff --git a/test/utilities/meta/meta.trans/meta.trans.other/Android.mk b/test/utilities/meta/meta.trans/meta.trans.other/Android.mk index 69085072f..754ba07c1 100644 --- a/test/utilities/meta/meta.trans/meta.trans.other/Android.mk +++ b/test/utilities/meta/meta.trans/meta.trans.other/Android.mk @@ -32,10 +32,6 @@ test_name := utilities/meta/meta.trans/meta.trans.other/underlying_type test_src := underlying_type.pass.cpp include external/libcxx/test/Android.build.mk -test_name := utilities/meta/meta.trans/meta.trans.other/aligned_storage -test_src := aligned_storage.pass.cpp -include external/libcxx/test/Android.build.mk - test_name := utilities/meta/meta.trans/meta.trans.other/enable_if test_src := enable_if.pass.cpp include external/libcxx/test/Android.build.mk @@ -48,4 +44,4 @@ test_name := utilities/meta/meta.trans/meta.trans.other/common_type test_src := common_type.pass.cpp include external/libcxx/test/Android.build.mk -include $(call all-makefiles-under,$(LOCAL_PATH)) \ No newline at end of file +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp b/test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.disabled.cpp similarity index 100% rename from test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp rename to test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.disabled.cpp