From 5a0729f5a4c323aaee60fa93a1b0823c74e32f4e Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 21 Mar 2018 12:32:14 +0000 Subject: [PATCH] Fix some libstdc++ testsuite failures * testsuite/20_util/function_objects/comparisons_pointer.cc: Use VERIFY instead of assert. * testsuite/20_util/hash/84998.cc: New test. * testsuite/23_containers/vector/cons/destructible_debug_neg.cc: New copy of test adjusted for Debug Mode. * testsuite/23_containers/vector/cons/destructible_neg.cc: Do not run test in Debug Mode. From-SVN: r258714 --- libstdc++-v3/ChangeLog | 10 ++++ .../function_objects/comparisons_pointer.cc | 2 +- libstdc++-v3/testsuite/20_util/hash/84998.cc | 40 ++++++++++++++++ .../vector/cons/destructible_debug_neg.cc | 48 +++++++++++++++++++ .../vector/cons/destructible_neg.cc | 1 + 5 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/20_util/hash/84998.cc create mode 100644 libstdc++-v3/testsuite/23_containers/vector/cons/destructible_debug_neg.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7ac98fb2143..4bdda7e9bf9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2018-03-21 Jonathan Wakely + + * testsuite/20_util/function_objects/comparisons_pointer.cc: Use + VERIFY instead of assert. + * testsuite/20_util/hash/84998.cc: New test. + * testsuite/23_containers/vector/cons/destructible_debug_neg.cc: New + copy of test adjusted for Debug Mode. + * testsuite/23_containers/vector/cons/destructible_neg.cc: Do not run + test in Debug Mode. + 2018-03-20 François Dumont PR libstdc++/84998 diff --git a/libstdc++-v3/testsuite/20_util/function_objects/comparisons_pointer.cc b/libstdc++-v3/testsuite/20_util/function_objects/comparisons_pointer.cc index aad0bc3dd2e..474190cdf81 100644 --- a/libstdc++-v3/testsuite/20_util/function_objects/comparisons_pointer.cc +++ b/libstdc++-v3/testsuite/20_util/function_objects/comparisons_pointer.cc @@ -174,7 +174,7 @@ test05() int n = 0; while (ss >> n) sum += n; - assert( sum == 1 ); + VERIFY( sum == 1 ); #if __cplusplus >= 201402L static_assert( lt(y, y+1), "constexpr less" ); diff --git a/libstdc++-v3/testsuite/20_util/hash/84998.cc b/libstdc++-v3/testsuite/20_util/hash/84998.cc new file mode 100644 index 00000000000..72bd203cb04 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/hash/84998.cc @@ -0,0 +1,40 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-D_GLIBCXX_DEBUG" } +// { dg-do compile { target c++11 } } + +// PR libstdc++/84998 + +#include +#include + +std::size_t +test01() +{ + std::bitset<1> b; + std::hash> h; + return h(b); +} + +std::size_t +test02() +{ + std::vector b; + std::hash> h; + return h(b); +} diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_debug_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_debug_neg.cc new file mode 100644 index 00000000000..5127f5105f4 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_debug_neg.cc @@ -0,0 +1,48 @@ +// Copyright (C) 2017-2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-D_GLIBCXX_DEBUG" } +// { dg-do compile { target c++11 } } + +#include + +// PR libstdc++/80553 + +struct DeletedDtor { + ~DeletedDtor() = delete; +}; + +class PrivateDtor { + ~PrivateDtor() { } +}; + +void +test01() +{ + std::vector v; +} + +void +test02() +{ + std::vector v; +} + +// { dg-error "value type is destructible" "" { target *-*-* } 0 } + +// In Debug Mode the "required from here" errors come from +// { dg-error "required from here" "" { target *-*-* } 155 } diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_neg.cc index fc5e3192c87..06fd0730106 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_neg.cc @@ -16,6 +16,7 @@ // . // { dg-do compile { target c++11 } } +// { dg-require-normal-mode "" } #include -- 2.30.2