From 6c539f2e6766e08351199700ce2eeaeff11e3b42 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Sat, 2 Jul 2016 14:55:20 +0000 Subject: [PATCH] get_debug_neg.cc: Adjust dg-error line numbers. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2016-07-02 François Dumont * testsuite/23_containers/array/tuple_interface/get_debug_neg.cc: Adjust dg-error line numbers. * testsuite/23_containers/array/tuple_interface/ tuple_element_debug_neg.cc: Likewise. * testsuite/25_algorithms/lexicographical_compare/debug/ irreflexive_neg.cc: Remove. From-SVN: r237945 --- libstdc++-v3/ChangeLog | 9 +++ .../array/tuple_interface/get_debug_neg.cc | 6 +- .../tuple_element_debug_neg.cc | 2 +- .../debug/irreflexive_neg.cc | 70 ------------------- 4 files changed, 13 insertions(+), 74 deletions(-) delete mode 100644 libstdc++-v3/testsuite/25_algorithms/lexicographical_compare/debug/irreflexive_neg.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a2764531579..53d040573a5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2016-07-02 François Dumont + + * testsuite/23_containers/array/tuple_interface/get_debug_neg.cc: Adjust + dg-error line numbers. + * testsuite/23_containers/array/tuple_interface/ + tuple_element_debug_neg.cc: Likewise. + * testsuite/25_algorithms/lexicographical_compare/debug/ + irreflexive_neg.cc: Remove. + 2016-06-30 Thomas Preud'homme * testsuite/29_atomics/atomic/65913.cc: Require atomic-builtins rather diff --git a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/get_debug_neg.cc b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/get_debug_neg.cc index 36feb3c140c..6d469a54389 100644 --- a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/get_debug_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/get_debug_neg.cc @@ -28,6 +28,6 @@ int n1 = std::get<1>(a); int n2 = std::get<1>(std::move(a)); int n3 = std::get<1>(ca); -// { dg-error "static assertion failed" "" { target *-*-* } 274 } -// { dg-error "static assertion failed" "" { target *-*-* } 283 } -// { dg-error "static assertion failed" "" { target *-*-* } 291 } +// { dg-error "static assertion failed" "" { target *-*-* } 273 } +// { dg-error "static assertion failed" "" { target *-*-* } 282 } +// { dg-error "static assertion failed" "" { target *-*-* } 290 } diff --git a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc index b761005f8a0..6789f233c75 100644 --- a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc @@ -23,4 +23,4 @@ typedef std::tuple_element<1, std::array>::type type; -// { dg-error "static assertion failed" "" { target *-*-* } 309 } +// { dg-error "static assertion failed" "" { target *-*-* } 308 } diff --git a/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare/debug/irreflexive_neg.cc b/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare/debug/irreflexive_neg.cc deleted file mode 100644 index 26e7f87eb78..00000000000 --- a/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare/debug/irreflexive_neg.cc +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (C) 2015-2016 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 "-std=gnu++11" } -// { dg-require-debug-mode "" } -// { dg-do run { xfail *-*-* } } - -#include -#include - -struct A -{ - A(int i) : _i(i) - { } - - int _i; -}; - -bool -operator<(A a, int i) -{ return a._i < i; } - -bool -operator<(int i, A a) -{ return i < a._i; } - -void test01() -{ - bool test __attribute__((unused)) = true; - - A as[] { 0, 1, 2, 3 }; - int is[] { 0, 1, 2, 3 }; - VERIFY( !std::lexicographical_compare(as, as + 4, is, is + 4) ); -} - -bool -bad_lower(int lhs, int rhs) -{ - if (lhs == 0) - return true; - - return lhs < rhs; -} - -void test02() -{ - int is[] { 0, 1, 2, 3 }; - std::lexicographical_compare(is, is + 4, is, is + 4, bad_lower); -} - -int main() -{ - test01(); - test02(); - return 0; -} -- 2.30.2