diff options
author | François Dumont <francois.cppdevs@free.fr> | 2010-09-03 20:10:46 +0200 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-09-03 18:10:46 +0000 |
commit | d78301422a49df7a588e9b6a3c037ddb4c55e153 (patch) | |
tree | 5fc73bda449ee2263a285ace1c2f34ff20e1eb47 /libstdc++-v3/testsuite/23_containers/set/debug | |
parent | 124a8ce610d0f8d315d491810e4b69b686c9c6a8 (diff) | |
download | gcc-d78301422a49df7a588e9b6a3c037ddb4c55e153.tar.gz |
libstdc++.exp ([check_v3_target_debug_mode]): Fix so that it really detects when debug mode is activated.
2010-09-03 François Dumont <francois.cppdevs@free.fr>
* testsuite/lib/libstdc++.exp ([check_v3_target_debug_mode]): Fix so
that it really detects when debug mode is activated.
* testsuite/util/debug/construct_neg.h, insert_neg.h, assign_neg.h:
Remove, content moved...
* testsuite/util/debug/checks.h: ... here. Modify checks to take the
type of the container to test rather than an intermediate container
type traits helper.
* testsuite/23_containers/unordered_map/debug/insert1_neg.cc: Update to
use dg-require-debug-mode when necessary and use new check functions.
* testsuite/23_containers/unordered_map/debug/construct1_neg.cc:
Likewise.
* testsuite/23_containers/unordered_map/debug/construct2_neg.cc:
Likewise.
* testsuite/23_containers/unordered_map/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/construct3_neg.cc:
Likewise.
* testsuite/23_containers/unordered_map/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/construct4_neg.cc:
Likewise.
* testsuite/23_containers/unordered_map/debug/insert4_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/construct4_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/insert4_neg.cc: Likewise.
* testsuite/23_containers/set/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/set/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/set/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/set/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/set/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/set/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/set/debug/construct4_neg.cc: Likewise.
* testsuite/23_containers/set/debug/insert4_neg.cc: Likewise.
* testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc:
Likewise.
* testsuite/23_containers/vector/debug/assign1_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/assign2_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/assign3_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/construct4_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/assign4_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/insert4_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/construct1_neg.cc:
Likewise.
* testsuite/23_containers/unordered_set/debug/construct2_neg.cc:
Likewise.
* testsuite/23_containers/unordered_set/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/construct3_neg.cc:
Likewise.
* testsuite/23_containers/unordered_set/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/construct4_neg.cc:
Likewise.
* testsuite/23_containers/unordered_set/debug/insert4_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/assign1_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/assign2_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/assign3_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/construct4_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/assign4_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/insert4_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/construct4_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/insert4_neg.cc: Likewise.
* testsuite/23_containers/list/debug/assign1_neg.cc: Likewise.
* testsuite/23_containers/list/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/list/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/list/debug/assign2_neg.cc: Likewise.
* testsuite/23_containers/list/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/list/debug/assign3_neg.cc: Likewise.
* testsuite/23_containers/list/debug/construct4_neg.cc: Likewise.
* testsuite/23_containers/list/debug/assign4_neg.cc: Likewise.
* testsuite/23_containers/list/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/list/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/list/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/list/debug/insert4_neg.cc: Likewise.
* testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/insert4_neg.cc:
Likewise.
* testsuite/23_containers/map/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/map/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/map/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/map/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/map/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/map/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/map/debug/construct4_neg.cc: Likewise.
* testsuite/23_containers/map/debug/insert4_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/cont_traits.h: Remove.
* testsuite/23_containers/unordered_map/debug/debug_cont_traits.h:
Likewise.
* testsuite/23_containers/multimap/debug/cont_traits.h: Likewise.
* testsuite/23_containers/multimap/debug/debug_cont_traits.h: Likewise.
* testsuite/23_containers/set/debug/cont_traits.h: Likewise.
* testsuite/23_containers/set/debug/debug_cont_traits.h: Likewise.
* testsuite/23_containers/unordered_multimap/debug/cont_traits.h:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/
debug_cont_traits.h: Likewise.
* testsuite/23_containers/vector/debug/cont_traits.h: Likewise.
* testsuite/23_containers/vector/debug/debug_cont_traits.h: Likewise.
* testsuite/23_containers/unordered_set/debug/cont_traits.h: Likewise.
* testsuite/23_containers/unordered_set/debug/debug_cont_traits.h:
Likewise.
* testsuite/23_containers/deque/debug/cont_traits.h: Likewise.
* testsuite/23_containers/deque/debug/debug_cont_traits.h: Likewise.
* testsuite/23_containers/multiset/debug/cont_traits.h: Likewise.
* testsuite/23_containers/multiset/debug/debug_cont_traits.h: Likewise.
* testsuite/23_containers/list/debug/cont_traits.h: Likewise.
* testsuite/23_containers/list/debug/debug_cont_traits.h: Likewise.
* testsuite/23_containers/unordered_multiset/debug/cont_traits.h:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/
debug_cont_traits.h: Likewise.
* testsuite/23_containers/map/debug/cont_traits.h: Likewise.
* testsuite/23_containers/map/debug/debug_cont_traits.h: Likewise.
* testsuite/21_strings/basic_string/element_access/char: Tidy.
* testsuite/21_strings/basic_string/element_access/wchar_t: Likewise.
From-SVN: r163837
Diffstat (limited to 'libstdc++-v3/testsuite/23_containers/set/debug')
10 files changed, 30 insertions, 94 deletions
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc index 791c1a296a1..424eb8be20e 100644 --- a/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc @@ -15,14 +15,15 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. // +// { dg-require-debug-mode "" } // { dg-do run { xfail *-*-* } } -#include <debug/construct_neg.h> -#include "cont_traits.h" +#include <set> +#include <debug/checks.h> void test01() { - check1<cont_traits>(); + __gnu_test::check_construct1<std::set<int> >(); } int main() diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc index 6cac9f03147..d5819925b50 100644 --- a/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc @@ -15,14 +15,15 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. // +// { dg-require-debug-mode "" } // { dg-do run { xfail *-*-* } } -#include <debug/construct_neg.h> -#include "cont_traits.h" +#include <set> +#include <debug/checks.h> void test01() { - check2<cont_traits>(); + __gnu_test::check_construct2<std::set<int> >(); } int main() diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc index 752c95c671f..1cc7dd2345d 100644 --- a/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc @@ -15,14 +15,15 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. // +// { dg-require-debug-mode "" } // { dg-do run { xfail *-*-* } } -#include <debug/construct_neg.h> -#include "cont_traits.h" +#include <set> +#include <debug/checks.h> void test01() { - check3<cont_traits>(); + __gnu_test::check_construct3<std::set<int> >(); } int main() diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct4_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct4_neg.cc index 9ee467e0f0f..d464aabfbab 100644 --- a/libstdc++-v3/testsuite/23_containers/set/debug/construct4_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct4_neg.cc @@ -17,12 +17,12 @@ // // { dg-do run { xfail *-*-* } } -#include <debug/construct_neg.h> -#include "debug_cont_traits.h" +#include <debug/set> +#include <debug/checks.h> void test01() { - debug_check1<cont_traits>(); + __gnu_test::check_construct1<__gnu_debug::set<int> >(); } int main() diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/cont_traits.h b/libstdc++-v3/testsuite/23_containers/set/debug/cont_traits.h deleted file mode 100644 index fbcc0ff3eb2..00000000000 --- a/libstdc++-v3/testsuite/23_containers/set/debug/cont_traits.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (C) 2010 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 -// <http://www.gnu.org/licenses/>. -// - -#include <set> - -template<typename Type> - struct cont_traits - { - typedef std::set<Type> cont_type; - typedef Type val_type; - - static val_type - make_val(Type val) - { return val; } - - template<typename Iter> - static void - insert(cont_type& cont, Iter first, Iter last) - { cont.insert(first, last); } - }; diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/debug_cont_traits.h b/libstdc++-v3/testsuite/23_containers/set/debug/debug_cont_traits.h deleted file mode 100644 index 5f693769128..00000000000 --- a/libstdc++-v3/testsuite/23_containers/set/debug/debug_cont_traits.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (C) 2010 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 -// <http://www.gnu.org/licenses/>. -// - -#include <debug/set> - -template<typename Type> - struct cont_traits - { - typedef __gnu_debug::set<Type> cont_type; - typedef Type val_type; - - static val_type - make_val(Type val) - { return val; } - - template<typename Iter> - static void - insert(cont_type& cont, Iter first, Iter last) - { cont.insert(first, last); } - }; diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc index d04b44148ee..3192ff9594f 100644 --- a/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc @@ -15,14 +15,15 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. // +// { dg-require-debug-mode "" } // { dg-do run { xfail *-*-* } } -#include <debug/insert_neg.h> -#include "cont_traits.h" +#include <set> +#include <debug/checks.h> void test01() { - check1<cont_traits>(); + __gnu_test::check_insert1<std::set<int> >(); } int main() diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc index 106c64adb29..d0d16cfb9dd 100644 --- a/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc @@ -15,14 +15,15 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. // +// { dg-require-debug-mode "" } // { dg-do run { xfail *-*-* } } -#include <debug/insert_neg.h> -#include "cont_traits.h" +#include <set> +#include <debug/checks.h> void test01() { - check2<cont_traits>(); + __gnu_test::check_insert2<std::set<int> >(); } int main() diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc index 9d3d7b1ad85..9eaf6f82bed 100644 --- a/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc @@ -15,14 +15,15 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. // +// { dg-require-debug-mode "" } // { dg-do run { xfail *-*-* } } -#include <debug/insert_neg.h> -#include "cont_traits.h" +#include <set> +#include <debug/checks.h> void test01() { - check3<cont_traits>(); + __gnu_test::check_insert3<std::set<int> >(); } int main() diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert4_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert4_neg.cc index fc49ae65558..c2424d2a370 100644 --- a/libstdc++-v3/testsuite/23_containers/set/debug/insert4_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert4_neg.cc @@ -17,12 +17,12 @@ // // { dg-do run { xfail *-*-* } } -#include <debug/insert_neg.h> -#include "debug_cont_traits.h" +#include <debug/set> +#include <debug/checks.h> void test01() { - debug_check1<cont_traits>(); + __gnu_test::check_insert1<__gnu_debug::set<int> >(); } int main() |