diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-01-04 18:56:26 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-01-04 18:56:26 +0000 |
| commit | 6908c1dc6fc8d377ba80f12b7889e7872505cbb0 (patch) | |
| tree | d06630cea6eb089214fb247d1d2104675bcd4d48 /libstdc++-v3 | |
| parent | 35a5722c7b3938cf26a03aed4c5387f550d8ac3e (diff) | |
| download | gcc-6908c1dc6fc8d377ba80f12b7889e7872505cbb0.zip gcc-6908c1dc6fc8d377ba80f12b7889e7872505cbb0.tar.gz gcc-6908c1dc6fc8d377ba80f12b7889e7872505cbb0.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/list/61347.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 30a52fc..0297d93 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2019-01-04 Jonathan Wakely <jwakely@redhat.com> + * 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 0ae9058..178c306 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<short>& l) int main() { -#if _GLIBCXX_USE_DUAL_ABI +#if ! __NO_INLINE__ std::list<short> l; testm(l); testc(l); |