From 6ab94513d51351c9aff8542a1ac8b40fe273fe41 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 1 Jan 2010 11:27:50 +0000 Subject: [PATCH] 2010-01-01 Paolo Carlini Revert last change, reinstantiate basic_string and vstring tests. From-SVN: r155547 --- libstdc++-v3/ChangeLog | 4 ++ .../requirements/exception/basic.cc | 41 ++++++++++++++ .../exception/generation_prohibited.cc | 54 ++++++++++++++++++ .../exception/propagation_consistent.cc | 42 ++++++++++++++ .../vstring/requirements/exception/basic.cc | 55 +++++++++++++++++++ .../exception/generation_prohibited.cc | 52 ++++++++++++++++++ .../exception/propagation_consistent.cc | 55 +++++++++++++++++++ 7 files changed, 303 insertions(+) create mode 100644 libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/basic.cc create mode 100644 libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/generation_prohibited.cc create mode 100644 libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/propagation_consistent.cc create mode 100644 libstdc++-v3/testsuite/ext/vstring/requirements/exception/basic.cc create mode 100644 libstdc++-v3/testsuite/ext/vstring/requirements/exception/generation_prohibited.cc create mode 100644 libstdc++-v3/testsuite/ext/vstring/requirements/exception/propagation_consistent.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 06b1a9d4862a..289cf74deac6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2010-01-01 Paolo Carlini + + Revert last change, reinstantiate basic_string and vstring tests. + 2010-01-01 Paolo Carlini * testsuite/21_strings/basic_string/requirements/exception/ diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/basic.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/basic.cc new file mode 100644 index 000000000000..1f6b970d2bfc --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/basic.cc @@ -0,0 +1,41 @@ +// { dg-options "-std=gnu++0x" } +// { dg-require-cstdint "" } + +// 2009-11-10 Benjamin Kosnik + +// Copyright (C) 2009 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 +// . + +#include +#include + +void +value() +{ + typedef __gnu_cxx::throw_value_limit value_type; + typedef __gnu_cxx::throw_allocator_limit allocator_type; + typedef std::char_traits traits_type; + typedef std::basic_string test_type; + __gnu_test::basic_safety test; +} + +// Container requirement testing, exceptional behavior +int main() +{ + value(); + return 0; +} diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/generation_prohibited.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/generation_prohibited.cc new file mode 100644 index 000000000000..211d7c21d89e --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/generation_prohibited.cc @@ -0,0 +1,54 @@ +// { dg-options "-std=gnu++0x" } +// { dg-require-cstdint "" } + +// 2009-09-14 Benjamin Kosnik + +// Copyright (C) 2009 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 +// . + +#include +#include + +void +char_allocator() +{ + typedef char value_type; + typedef __gnu_cxx::throw_allocator_random allocator_type; + typedef std::char_traits traits_type; + typedef std::basic_string test_type; + __gnu_test::generation_prohibited test; +} + +void +wchar_allocator() +{ + typedef wchar_t value_type; + typedef __gnu_cxx::throw_allocator_random allocator_type; + typedef std::char_traits traits_type; + typedef std::basic_string test_type; + __gnu_test::generation_prohibited test; +} + +// Container requirement testing, exceptional behavior +int main() +{ + // throw_allocator + char_allocator(); + wchar_allocator(); + + return 0; +} diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/propagation_consistent.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/propagation_consistent.cc new file mode 100644 index 000000000000..8e27a919ce13 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/propagation_consistent.cc @@ -0,0 +1,42 @@ +// { dg-options "-std=gnu++0x" } +// { dg-require-cstdint "" } +// { dg-do run { xfail *-*-* } } + +// 2009-09-14 Benjamin Kosnik + +// Copyright (C) 2009 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 +// . + +#include +#include + +void +value() +{ + typedef __gnu_cxx::throw_value_limit value_type; + typedef __gnu_cxx::throw_allocator_limit allocator_type; + typedef std::char_traits traits_type; + typedef std::basic_string test_type; + __gnu_test::propagation_consistent test; +} + +// Container requirement testing, exceptional behavior +int main() +{ + value(); + return 0; +} diff --git a/libstdc++-v3/testsuite/ext/vstring/requirements/exception/basic.cc b/libstdc++-v3/testsuite/ext/vstring/requirements/exception/basic.cc new file mode 100644 index 000000000000..a0042d488265 --- /dev/null +++ b/libstdc++-v3/testsuite/ext/vstring/requirements/exception/basic.cc @@ -0,0 +1,55 @@ +// { dg-options "-std=gnu++0x" } +// { dg-require-cstdint "" } + +// 2009-11-10 Benjamin Kosnik + +// Copyright (C) 2009 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 +// . + +#include +#include + +void +value() +{ +#if 1 + typedef char value_type; +#else + // XXX + // __gnu_cxx::__rc_string_base<>::_Rep::_M_align’ with constructor + // not allowed in union + // typedef __gnu_cxx::throw_value_limit value_type; +#endif + typedef __gnu_cxx::throw_allocator_limit allocator_type; + typedef std::char_traits traits_type; + + typedef __gnu_cxx::__versa_string test_type_rc; + + typedef __gnu_cxx::__versa_string test_type_sso; + + __gnu_test::basic_safety test_rc; + __gnu_test::basic_safety test_sso; +} + +// Container requirement testing, exceptional behavior +int main() +{ + value(); + return 0; +} diff --git a/libstdc++-v3/testsuite/ext/vstring/requirements/exception/generation_prohibited.cc b/libstdc++-v3/testsuite/ext/vstring/requirements/exception/generation_prohibited.cc new file mode 100644 index 000000000000..4ffe0df3bc4a --- /dev/null +++ b/libstdc++-v3/testsuite/ext/vstring/requirements/exception/generation_prohibited.cc @@ -0,0 +1,52 @@ +// { dg-options "-std=gnu++0x" } +// { dg-require-cstdint "" } + +// 2009-09-14 Benjamin Kosnik + +// Copyright (C) 2009 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 +// . + +#include +#include + +void +char_instance() +{ + typedef char value_type; + typedef __gnu_cxx::throw_allocator_random allocator_type; + typedef std::char_traits traits_type; + typedef __gnu_cxx::__versa_string test_type; + __gnu_test::generation_prohibited test; +} + +void +wchar_instance() +{ + typedef wchar_t value_type; + typedef __gnu_cxx::throw_allocator_random allocator_type; + typedef std::char_traits traits_type; + typedef __gnu_cxx::__versa_string test_type; + __gnu_test::generation_prohibited test; +} + +// Container requirement testing, exceptional behavior +int main() +{ + char_instance(); + wchar_instance(); + return 0; +} diff --git a/libstdc++-v3/testsuite/ext/vstring/requirements/exception/propagation_consistent.cc b/libstdc++-v3/testsuite/ext/vstring/requirements/exception/propagation_consistent.cc new file mode 100644 index 000000000000..09d8618ab80c --- /dev/null +++ b/libstdc++-v3/testsuite/ext/vstring/requirements/exception/propagation_consistent.cc @@ -0,0 +1,55 @@ +// { dg-options "-std=gnu++0x" } +// { dg-require-cstdint "" } + +// 2009-09-14 Benjamin Kosnik + +// Copyright (C) 2009 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 +// . + +#include +#include + +void +value() +{ +#if 1 + typedef char value_type; +#else + // XXX + // __gnu_cxx::__rc_string_base<>::_Rep::_M_align’ with constructor + // not allowed in union + // typedef __gnu_cxx::throw_value_limit value_type; +#endif + typedef __gnu_cxx::throw_allocator_limit allocator_type; + typedef std::char_traits traits_type; + + typedef __gnu_cxx::__versa_string test_type_rc; + + typedef __gnu_cxx::__versa_string test_type_sso; + + __gnu_test::propagation_consistent test_rc; + __gnu_test::propagation_consistent test_sso; +} + +// Container requirement testing, exceptional behavior +int main() +{ + value(); + return 0; +} -- 2.47.3