[v3] Move around some unordered_* tests

Message ID	4C6543FF.6080008@oracle.com
State	New
Headers	show Return-Path: <gcc-patches-return-270451-incoming=patchwork.ozlabs.org@gcc.gnu.org> Message-ID: <4C6543FF.6080008@oracle.com> Date: Fri, 13 Aug 2010 15:09:19 +0200 From: Paolo Carlini <paolo.carlini@oracle.com> User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100714 SUSE/3.0.6 Thunderbird/3.0.6 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org> CC: libstdc++ <libstdc++@gcc.gnu.org> Subject: [v3] Move around some unordered_* tests Content-Type: multipart/mixed; boundary="------------020002030805020302050108" Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org

Index: testsuite/23_containers/unordered_map/dr1189.cc =================================================================== --- testsuite/23_containers/unordered_map/dr1189.cc (revision 163221) +++ testsuite/23_containers/unordered_map/dr1189.cc (working copy) @@ -1,48 +0,0 @@ -// { dg-options "-std=gnu++0x" } -// 2010-03-10 Paolo Carlini <paolo.carlini@oracle.com> -// -// 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 <unordered_map> -#include <testsuite_hooks.h> - -// DR 1189. Awkward interface for changing the number of buckets -// in an unordered associative container -void test01() -{ - bool test __attribute__((unused)) = true; - - std::unordered_map<int, double> m1; - m1.reserve(10); - VERIFY( m1.bucket_count() >= 10 ); - - m1.reserve(100); - VERIFY( m1.bucket_count() >= 100 ); - - std::unordered_map<int, double> m2(100); - VERIFY( m2.bucket_count() >= 100 ); - - m2.reserve(1000); - VERIFY( m2.bucket_count() >= 1000 ); -} - -int main() -{ - test01(); - return 0; -} Index: testsuite/23_containers/unordered_multimap/dr1189.cc =================================================================== --- testsuite/23_containers/unordered_multimap/dr1189.cc (revision 163221) +++ testsuite/23_containers/unordered_multimap/dr1189.cc (working copy) @@ -1,48 +0,0 @@ -// { dg-options "-std=gnu++0x" } -// 2010-03-10 Paolo Carlini <paolo.carlini@oracle.com> -// -// 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 <unordered_map> -#include <testsuite_hooks.h> - -// DR 1189. Awkward interface for changing the number of buckets -// in an unordered associative container -void test01() -{ - bool test __attribute__((unused)) = true; - - std::unordered_multimap<int, double> mm1; - mm1.reserve(10); - VERIFY( mm1.bucket_count() >= 10 ); - - mm1.reserve(100); - VERIFY( mm1.bucket_count() >= 100 ); - - std::unordered_map<int, double> mm2(100); - VERIFY( mm2.bucket_count() >= 100 ); - - mm2.reserve(1000); - VERIFY( mm2.bucket_count() >= 1000 ); -} - -int main() -{ - test01(); - return 0; -} Index: testsuite/23_containers/unordered_set/hash_policy/26132.cc =================================================================== --- testsuite/23_containers/unordered_set/hash_policy/26132.cc (revision 0) +++ testsuite/23_containers/unordered_set/hash_policy/26132.cc (revision 0) @@ -0,0 +1,57 @@ +// { dg-options "-std=gnu++0x" } + +// 2010-08-13 Paolo Carlini <paolo.carlini@oracle.com> +// +// 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 <unordered_set> +#include <testsuite_hooks.h> + +// libstdc++/26132 +void test01() +{ + bool test __attribute__((unused)) = true; + + for (float lf = 1.0; lf < 101.0; lf *= 10.0) + for (int size = 1; size <= 6561; size *= 3) + { + std::unordered_set<int> us1; + typedef std::unordered_set<int>::size_type size_type; + + us1.max_load_factor(10.0); + + for (int i = 0; i < size; ++i) + us1.insert(i); + + us1.max_load_factor(lf); + + for (int i = 1; i <= 6561; i *= 81) + { + const size_type n = size * 81 / i; + us1.rehash(n); + VERIFY( us1.bucket_count() > us1.size() / us1.max_load_factor() ); + VERIFY( us1.bucket_count() >= n ); + } + } +} + +int main() +{ + test01(); + return 0; +} Index: testsuite/23_containers/unordered_set/dr1189.cc =================================================================== --- testsuite/23_containers/unordered_set/dr1189.cc (revision 163221) +++ testsuite/23_containers/unordered_set/dr1189.cc (working copy) @@ -1,48 +0,0 @@ -// { dg-options "-std=gnu++0x" } -// 2010-03-10 Paolo Carlini <paolo.carlini@oracle.com> -// -// 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 <unordered_set> -#include <testsuite_hooks.h> - -// DR 1189. Awkward interface for changing the number of buckets -// in an unordered associative container -void test01() -{ - bool test __attribute__((unused)) = true; - - std::unordered_set<int> s1; - s1.reserve(10); - VERIFY( s1.bucket_count() >= 10 ); - - s1.reserve(100); - VERIFY( s1.bucket_count() >= 100 ); - - std::unordered_set<int> s2(100); - VERIFY( s2.bucket_count() >= 100 ); - - s2.reserve(1000); - VERIFY( s2.bucket_count() >= 1000 ); -} - -int main() -{ - test01(); - return 0; -} Index: testsuite/23_containers/unordered_multiset/dr1189.cc =================================================================== --- testsuite/23_containers/unordered_multiset/dr1189.cc (revision 163221) +++ testsuite/23_containers/unordered_multiset/dr1189.cc (working copy) @@ -1,48 +0,0 @@ -// { dg-options "-std=gnu++0x" } -// 2010-03-10 Paolo Carlini <paolo.carlini@oracle.com> -// -// 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 <unordered_set> -#include <testsuite_hooks.h> - -// DR 1189. Awkward interface for changing the number of buckets -// in an unordered associative container -void test01() -{ - bool test __attribute__((unused)) = true; - - std::unordered_multiset<int> ms1; - ms1.reserve(10); - VERIFY( ms1.bucket_count() >= 10 ); - - ms1.reserve(100); - VERIFY( ms1.bucket_count() >= 100 ); - - std::unordered_multiset<int> ms2(100); - VERIFY( ms2.bucket_count() >= 100 ); - - ms2.reserve(1000); - VERIFY( ms2.bucket_count() >= 1000 ); -} - -int main() -{ - test01(); - return 0; -}

[v3] Move around some unordered_* tests

Commit Message

Patch