From d754b55a5aa58256468a9a8fe0a61e4ce254aba4 Mon Sep 17 00:00:00 2001 From: paolo Date: Thu, 4 Mar 2004 23:29:44 +0000 Subject: [PATCH] 2004-03-04 Paolo Carlini * scripts/testsuite_flags.in: Add "-D_GLIBCXX_ASSERT" to CXXFLAGS_save. * testsuite/lib/libstdc++.exp: Don't add it conditionally to DEFAULT_CXXFLAGS. * testsuite/18_support/numeric_limits.cc: Remove "-D_GLIBCXX_ASSERT" from the dg-options. * testsuite/23_containers/vector/invalidation/1.cc: Likewise. * testsuite/23_containers/vector/invalidation/2.cc: Likewise. * testsuite/23_containers/vector/invalidation/3.cc: Likewise. * testsuite/23_containers/vector/invalidation/4.cc: Likewise. * testsuite/23_containers/vector/resize/1.cc: Likewise. * testsuite/26_numerics/complex_value.cc: Likewise. * testsuite/27_io/ios_base/storage/1.cc: Likewise. * testsuite/27_io/ios_base/storage/2.cc: Likewise. * testsuite/27_io/ios_base/storage/3.cc: Likewise. * testsuite/27_io/manipulators/standard/char/2.cc: Likewise. * testsuite/27_io/objects/char/5.cc: Likewise. * testsuite/27_io/objects/wchar_t/5.cc: Likewise. * testsuite/backward/11460.cc: Likewise. * testsuite/thread/pthread7-rope.cc: Likewise. * testsuite/21_strings/basic_string/compare/char/1.cc: Add missing test variable. * testsuite/21_strings/basic_string/compare/wchar_t/1.cc: Add missing test variable. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78942 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 28 ++++++++++++++++++++++ libstdc++-v3/scripts/testsuite_flags.in | 2 +- .../testsuite/18_support/numeric_limits.cc | 4 ++-- .../21_strings/basic_string/compare/char/1.cc | 3 ++- .../21_strings/basic_string/compare/wchar_t/1.cc | 3 ++- .../23_containers/vector/invalidation/1.cc | 4 ++-- .../23_containers/vector/invalidation/2.cc | 4 ++-- .../23_containers/vector/invalidation/3.cc | 4 ++-- .../23_containers/vector/invalidation/4.cc | 4 ++-- .../testsuite/23_containers/vector/resize/1.cc | 2 +- .../testsuite/26_numerics/complex_value.cc | 4 ++-- libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc | 4 ++-- libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc | 4 ++-- libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc | 4 ++-- .../27_io/manipulators/standard/char/2.cc | 4 ++-- libstdc++-v3/testsuite/27_io/objects/char/5.cc | 3 +-- libstdc++-v3/testsuite/27_io/objects/wchar_t/5.cc | 3 +-- libstdc++-v3/testsuite/backward/11460.cc | 4 ++-- libstdc++-v3/testsuite/lib/libstdc++.exp | 8 +++---- libstdc++-v3/testsuite/thread/pthread7-rope.cc | 4 ++-- 20 files changed, 63 insertions(+), 37 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2aa51bf..1c46f82 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,31 @@ +2004-03-04 Paolo Carlini + + * scripts/testsuite_flags.in: Add "-D_GLIBCXX_ASSERT" to + CXXFLAGS_save. + * testsuite/lib/libstdc++.exp: Don't add it conditionally to + DEFAULT_CXXFLAGS. + * testsuite/18_support/numeric_limits.cc: Remove "-D_GLIBCXX_ASSERT" + from the dg-options. + * testsuite/23_containers/vector/invalidation/1.cc: Likewise. + * testsuite/23_containers/vector/invalidation/2.cc: Likewise. + * testsuite/23_containers/vector/invalidation/3.cc: Likewise. + * testsuite/23_containers/vector/invalidation/4.cc: Likewise. + * testsuite/23_containers/vector/resize/1.cc: Likewise. + * testsuite/26_numerics/complex_value.cc: Likewise. + * testsuite/27_io/ios_base/storage/1.cc: Likewise. + * testsuite/27_io/ios_base/storage/2.cc: Likewise. + * testsuite/27_io/ios_base/storage/3.cc: Likewise. + * testsuite/27_io/manipulators/standard/char/2.cc: Likewise. + * testsuite/27_io/objects/char/5.cc: Likewise. + * testsuite/27_io/objects/wchar_t/5.cc: Likewise. + * testsuite/backward/11460.cc: Likewise. + * testsuite/thread/pthread7-rope.cc: Likewise. + + * testsuite/21_strings/basic_string/compare/char/1.cc: Add + missing test variable. + * testsuite/21_strings/basic_string/compare/wchar_t/1.cc: Add + missing test variable. + 2004-03-04 Benjamin Kosnik * testsuite/20_util/allocator/1.cc: Provide explicit diff --git a/libstdc++-v3/scripts/testsuite_flags.in b/libstdc++-v3/scripts/testsuite_flags.in index f66082e..2a74f47 100755 --- a/libstdc++-v3/scripts/testsuite_flags.in +++ b/libstdc++-v3/scripts/testsuite_flags.in @@ -47,7 +47,7 @@ case ${query} in echo ${CXX} ;; --cxxflags) - CXXFLAGS_save="-g -O2" + CXXFLAGS_save="-g -O2 -D_GLIBCXX_ASSERT" CXXFLAGS_config='@SECTION_FLAGS@ @SECTION_LDFLAGS@ -fmessage-length=0 @EXTRA_CXX_FLAGS@ -DLOCALEDIR="@glibcxx_localedir@" ' echo ${CXXFLAGS_save} ${CXXFLAGS_config} diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits.cc b/libstdc++-v3/testsuite/18_support/numeric_limits.cc index a7c2494..93be837 100644 --- a/libstdc++-v3/testsuite/18_support/numeric_limits.cc +++ b/libstdc++-v3/testsuite/18_support/numeric_limits.cc @@ -1,8 +1,8 @@ -// { dg-options "-D_GLIBCXX_ASSERT -mieee" { target alpha*-*-* } } +// { dg-options "-mieee" { target alpha*-*-* } } // 1999-08-23 bkoz -// Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation +// Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation // // 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 diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/compare/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/compare/char/1.cc index 096f4f3..75dc5ad 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/compare/char/1.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/compare/char/1.cc @@ -1,6 +1,6 @@ // 980930 bkoz work with libstdc++v3 -// Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2003, 2004 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 @@ -41,6 +41,7 @@ test_value(int result, want_value expected); int test_value(int result, want_value expected) { + bool test __attribute__((unused)) = true; bool pass = false; switch (expected) { diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/compare/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/compare/wchar_t/1.cc index 5d61519..2ad2520 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/compare/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/compare/wchar_t/1.cc @@ -1,6 +1,6 @@ // 980930 bkoz work with libstdc++v3 -// Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2003, 2004 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 @@ -41,6 +41,7 @@ test_value(int result, want_value expected); int test_value(int result, want_value expected) { + bool test __attribute__((unused)) = true; bool pass = false; switch (expected) { diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc index b93146f..1e1e524 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc @@ -1,6 +1,6 @@ // Vector iterator invalidation tests -// Copyright (C) 2003 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004 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 @@ -19,7 +19,7 @@ // USA. // We need to be pedantic about reallocations for this testcase to be correct. -// { dg-options "-D_GLIBCXX_ASSERT -D_GLIBCXX_DEBUG_PEDANTIC" } +// { dg-options "-D_GLIBCXX_DEBUG_PEDANTIC" } #ifndef _GLIBCXX_DEBUG_PEDANTIC # define _GLIBCXX_DEBUG_PEDANTIC 1 diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc index 75f67b0..13210ac 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc @@ -1,6 +1,6 @@ // Vector iterator invalidation tests -// Copyright (C) 2003 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004 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 @@ -19,7 +19,7 @@ // USA. // We need to be pedantic about reallocations for this testcase to be correct. -// { dg-options "-D_GLIBCXX_ASSERT -D_GLIBCXX_DEBUG_PEDANTIC" } +// { dg-options "-D_GLIBCXX_DEBUG_PEDANTIC" } #ifndef _GLIBCXX_DEBUG_PEDANTIC # define _GLIBCXX_DEBUG_PEDANTIC 1 diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc index 5447cf8..a0df965 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc @@ -1,6 +1,6 @@ // Vector iterator invalidation tests -// Copyright (C) 2003 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004 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 @@ -19,7 +19,7 @@ // USA. // We need to be pedantic about reallocations for this testcase to be correct. -// { dg-options "-D_GLIBCXX_ASSERT -D_GLIBCXX_DEBUG_PEDANTIC" } +// { dg-options "-D_GLIBCXX_DEBUG_PEDANTIC" } #ifndef _GLIBCXX_DEBUG_PEDANTIC # define _GLIBCXX_DEBUG_PEDANTIC 1 diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc index 347d231..8ee2234 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc @@ -1,6 +1,6 @@ // Vector iterator invalidation tests -// Copyright (C) 2003 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004 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 @@ -19,7 +19,7 @@ // USA. // We need to be pedantic about reallocations for this testcase to be correct. -// { dg-options "-D_GLIBCXX_ASSERT -D_GLIBCXX_DEBUG_PEDANTIC" } +// { dg-options "-D_GLIBCXX_DEBUG_PEDANTIC" } #ifndef _GLIBCXX_DEBUG_PEDANTIC # define _GLIBCXX_DEBUG_PEDANTIC 1 diff --git a/libstdc++-v3/testsuite/23_containers/vector/resize/1.cc b/libstdc++-v3/testsuite/23_containers/vector/resize/1.cc index 7bc5798..b5b31e8 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/resize/1.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/resize/1.cc @@ -24,7 +24,7 @@ // XXX This test will not work for irix6 because of bug(s) in libc malloc // XXX for very large allocations. However -lmalloc seems to work. // See http://gcc.gnu.org/ml/libstdc++/2002-12/msg00131.html -// { dg-options "-D_GLIBCXX_ASSERT -lmalloc" { target mips*-*-irix6* } } +// { dg-options "-lmalloc" { target mips*-*-irix6* } } #include #include diff --git a/libstdc++-v3/testsuite/26_numerics/complex_value.cc b/libstdc++-v3/testsuite/26_numerics/complex_value.cc index edb8f33..03f2628 100644 --- a/libstdc++-v3/testsuite/26_numerics/complex_value.cc +++ b/libstdc++-v3/testsuite/26_numerics/complex_value.cc @@ -1,8 +1,8 @@ -// { dg-options "-D_GLIBCXX_ASSERT -O0" } +// { dg-options "-O0" } // 2000-11-20 // Benjamin Kosnik bkoz@redhat.com -// Copyright (C) 2000, 2003 Free Software Foundation, Inc. +// Copyright (C) 2000, 2003, 2004 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 diff --git a/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc b/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc index 07b9bbe..7175331 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc @@ -1,6 +1,6 @@ // 2000-12-19 bkoz -// Copyright (C) 2000, 2002, 2003 Free Software Foundation +// Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation // // 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 @@ -24,7 +24,7 @@ // XXX bug(s) in libc malloc for very large allocations. However // XXX -lmalloc seems to work. // See http://gcc.gnu.org/ml/gcc/2002-05/msg01012.html -// { dg-options "-D_GLIBCXX_ASSERT -lmalloc" { target mips*-*-irix6* } } +// { dg-options "-lmalloc" { target mips*-*-irix6* } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc b/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc index 65ed829..0da1382 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc @@ -1,6 +1,6 @@ // 2000-12-19 bkoz -// Copyright (C) 2000, 2002, 2003 Free Software Foundation +// Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation // // 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 @@ -24,7 +24,7 @@ // XXX bug(s) in libc malloc for very large allocations. However // XXX -lmalloc seems to work. // See http://gcc.gnu.org/ml/gcc/2002-05/msg01012.html -// { dg-options "-D_GLIBCXX_ASSERT -lmalloc" { target mips*-*-irix6* } } +// { dg-options "-lmalloc" { target mips*-*-irix6* } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc b/libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc index 3a5d702..e0d477f 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc @@ -1,6 +1,6 @@ // 2000-12-19 bkoz -// Copyright (C) 2000, 2002, 2003 Free Software Foundation +// Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation // // 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 @@ -24,7 +24,7 @@ // XXX bug(s) in libc malloc for very large allocations. However // XXX -lmalloc seems to work. // See http://gcc.gnu.org/ml/gcc/2002-05/msg01012.html -// { dg-options "-D_GLIBCXX_ASSERT -lmalloc" { target mips*-*-irix6* } } +// { dg-options "-lmalloc" { target mips*-*-irix6* } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/manipulators/standard/char/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/2.cc index 6d07434..74376ec 100644 --- a/libstdc++-v3/testsuite/27_io/manipulators/standard/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/2.cc @@ -1,6 +1,6 @@ -// { dg-options "-D_GLIBCXX_ASSERT -fno-implicit-templates" } +// { dg-options "-fno-implicit-templates" } -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2004 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 diff --git a/libstdc++-v3/testsuite/27_io/objects/char/5.cc b/libstdc++-v3/testsuite/27_io/objects/char/5.cc index acf8d6d..a5177dc 100644 --- a/libstdc++-v3/testsuite/27_io/objects/char/5.cc +++ b/libstdc++-v3/testsuite/27_io/objects/char/5.cc @@ -1,7 +1,6 @@ -// { dg-options "-D_GLIBCXX_ASSERT" { target *-*-* } } // 2003-04-26 Petur Runolfsson -// Copyright (C) 2003 Free Software Foundation +// Copyright (C) 2003, 2004 Free Software Foundation // // 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 diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/5.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/5.cc index ed6f317..f7c4339 100644 --- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/5.cc +++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/5.cc @@ -1,7 +1,6 @@ -// { dg-options "-D_GLIBCXX_ASSERT" { target *-*-* } } // 2003-05-01 Petur Runolfsson -// Copyright (C) 2003 Free Software Foundation +// Copyright (C) 2003, 2004 Free Software Foundation // // 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 diff --git a/libstdc++-v3/testsuite/backward/11460.cc b/libstdc++-v3/testsuite/backward/11460.cc index a0139e9..25bcddd 100644 --- a/libstdc++-v3/testsuite/backward/11460.cc +++ b/libstdc++-v3/testsuite/backward/11460.cc @@ -1,5 +1,5 @@ -// { dg-options "-Wno-deprecated -D_GLIBCXX_ASSERT" } -// Copyright (C) 2003 Free Software Foundation, Inc. +// { dg-options "-Wno-deprecated" } +// Copyright (C) 2003, 2004 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 diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index e2c8ddd..8bba282 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -96,15 +96,13 @@ proc libstdc++_init { testfile } { # headers, or without assertions. global DEFAULT_CXXFLAGS if ![info exists DEFAULT_CXXFLAGS] then { - set DEFAULT_CXXFLAGS "-D_GLIBCXX_ASSERT" - # Set up includes for stdc++.h.gch, the precompiled header file. if { [file exists $flags_file] } { set cxxpchflags [exec sh $flags_file --cxxpchflags] } else { set cxxpchflags "" } - append DEFAULT_CXXFLAGS " ${cxxpchflags}" + set DEFAULT_CXXFLAGS " ${cxxpchflags}" # Host specific goo here. if { [string match "powerpc-*-darwin*" $target_triplet] } { @@ -195,7 +193,7 @@ proc libstdc++_init { testfile } { return "untested" } set cxx [transform "g++"] - set cxxflags "-ggdb3 -D_GLIBCXX_ASSERT" + set cxxflags "-ggdb3" set includes "-I./" } else { # If we find a testsuite_flags file, we're testing in the build dir. @@ -205,7 +203,7 @@ proc libstdc++_init { testfile } { set includes [exec sh $flags_file --build-includes] } else { set cxx [transform "g++"] - set cxxflags "-ggdb3 -D_GLIBCXX_ASSERT" + set cxxflags "-ggdb3" set includes "-I${srcdir}" } } diff --git a/libstdc++-v3/testsuite/thread/pthread7-rope.cc b/libstdc++-v3/testsuite/thread/pthread7-rope.cc index 5b4d099..916a455 100644 --- a/libstdc++-v3/testsuite/thread/pthread7-rope.cc +++ b/libstdc++-v3/testsuite/thread/pthread7-rope.cc @@ -19,8 +19,8 @@ // USA. // { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } } -// { dg-options "-D_GLIBCXX_ASSERT -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* } } -// { dg-options "-D_GLIBCXX_ASSERT -pthreads" { target *-*-solaris* } } +// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* } } +// { dg-options "-pthreads" { target *-*-solaris* } } #include #include -- 2.7.4