From 6908c1dc6fc8d377ba80f12b7889e7872505cbb0 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 4 Jan 2019 18:56:26 +0000 Subject: [PATCH] Fix test failure when -fno-inline is used This currently checks _GLIBCXX_USE_DUAL_ABI which is incorrect, as that can be true when _GLIBCXX_USE_CXX11_ABI == 0. The correct check would be _GLIBCXX_USE_CXX11_ABI == 1, but that's made redundant by the cxx11-abi effective target that the test requires. However, the test will fail if -fno-inline is used, so check __NO_INLINE__ instead. * testsuite/23_containers/list/61347.cc: Avoid spurious failure when -fno-inline added to test flags. From-SVN: r267582 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/testsuite/23_containers/list/61347.cc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 30a52fcdda5..0297d936919 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2019-01-04 Jonathan Wakely + * testsuite/23_containers/list/61347.cc: Avoid spurious failure when + -fno-inline added to test flags. + * testsuite/21_strings/basic_string/requirements/ explicit_instantiation/debug.cc: Remove XFAIL for old ABI. diff --git a/libstdc++-v3/testsuite/23_containers/list/61347.cc b/libstdc++-v3/testsuite/23_containers/list/61347.cc index 0ae905848ec..178c306698f 100644 --- a/libstdc++-v3/testsuite/23_containers/list/61347.cc +++ b/libstdc++-v3/testsuite/23_containers/list/61347.cc @@ -42,7 +42,7 @@ void testc(const std::list& l) int main() { -#if _GLIBCXX_USE_DUAL_ABI +#if ! __NO_INLINE__ std::list l; testm(l); testc(l); -- 2.30.2