2013-10-23 Chris Jefferson <chris@bubblescope.net>
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 23 Oct 2013 22:19:30 +0000 (22:19 +0000)
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 23 Oct 2013 22:19:30 +0000 (22:19 +0000)
    Paolo Carlini  <paolo.carlini@oracle.com>

* testsuite/util/testsuite_containergen.h: New.
* testsuite/util/testsuite_iterators.h (test_container<>::val): Add.
* testsuite/25_algorithms/nth_element/random_test.cc: New, use the
above.
* testsuite/25_algorithms/partial_sort/random_test.cc: Likewise.
* testsuite/25_algorithms/partial_sort_copy/random_test.cc: Likewise.
* testsuite/25_algorithms/sort/random_test.cc: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@203995 138bc75d-0d04-0410-961f-82ee72b054a4

libstdc++-v3/ChangeLog
libstdc++-v3/testsuite/25_algorithms/nth_element/random_test.cc [new file with mode: 0644]
libstdc++-v3/testsuite/25_algorithms/partial_sort/random_test.cc [new file with mode: 0644]
libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/random_test.cc [new file with mode: 0644]
libstdc++-v3/testsuite/25_algorithms/sort/random_test.cc [new file with mode: 0644]
libstdc++-v3/testsuite/util/testsuite_containergen.h [new file with mode: 0644]
libstdc++-v3/testsuite/util/testsuite_iterators.h

index 0dcda6e..31ada06 100644 (file)
@@ -1,3 +1,14 @@
+2013-10-23  Chris Jefferson  <chris@bubblescope.net>
+           Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * testsuite/util/testsuite_containergen.h: New.
+       * testsuite/util/testsuite_iterators.h (test_container<>::val): Add.
+       * testsuite/25_algorithms/nth_element/random_test.cc: New, use the
+       above.
+       * testsuite/25_algorithms/partial_sort/random_test.cc: Likewise.
+       * testsuite/25_algorithms/partial_sort_copy/random_test.cc: Likewise.
+       * testsuite/25_algorithms/sort/random_test.cc: Likewise.
+
 2013-10-23  Jason Merrill  <jason@redhat.com>
 
        * include/bits/hashtable.h (_Hashtable): Force EBO for _Hash_code_base.
diff --git a/libstdc++-v3/testsuite/25_algorithms/nth_element/random_test.cc b/libstdc++-v3/testsuite/25_algorithms/nth_element/random_test.cc
new file mode 100644 (file)
index 0000000..ef1d0b6
--- /dev/null
@@ -0,0 +1,63 @@
+// Copyright (C) 2013 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/>.
+
+// { dg-options "-std=gnu++11" }
+// { dg-options "-std=gnu++11 -DSIMULATOR_TEST" { target simulator } }
+// { dg-require-cstdint "" }
+
+// 25.4.2 [lib.alg.nth.element]
+
+#include <algorithm>
+#include <random>
+#include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+#include <testsuite_containergen.h>
+
+using __gnu_test::test_container;
+using __gnu_test::random_access_iterator_wrapper;
+
+typedef test_container<int, random_access_iterator_wrapper> Container;
+
+struct testNthElement
+{
+  template<typename Container, typename RandomGen>
+  void operator()(Container con, RandomGen& rg)
+  {
+    bool test __attribute__((unused)) = true;
+
+    const int size = con.end() - con.begin();
+    auto dist = std::uniform_int_distribution<>(0, size);
+    const int element = dist(rg);
+
+    std::nth_element(con.begin(), con.begin() + element, con.end());
+
+    if (element < size)
+      {
+        for (int i = 0; i < element; ++i)
+         VERIFY( con.val(i) <= con.val(element) );
+
+       for (int i = element + 1; i < size; ++i)
+         VERIFY( con.val(i) >= con.val(element) );
+      }
+  }
+};
+
+int 
+main()
+{
+  __gnu_test::test_containers<Container>(testNthElement());
+}
diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort/random_test.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort/random_test.cc
new file mode 100644 (file)
index 0000000..855e921
--- /dev/null
@@ -0,0 +1,62 @@
+// Copyright (C) 2013 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/>.
+
+// { dg-options "-std=gnu++11" }
+// { dg-options "-std=gnu++11 -DSIMULATOR_TEST" { target simulator } }
+// { dg-require-cstdint "" }
+
+// 25.4.1.3 [lib.alg.partial.sort]
+
+#include <algorithm>
+#include <random>
+#include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+#include <testsuite_containergen.h>
+
+using __gnu_test::test_container;
+using __gnu_test::random_access_iterator_wrapper;
+
+typedef test_container<int, random_access_iterator_wrapper> Container;
+
+struct testPartialSort
+{
+  template<typename Container, typename RandomGen>
+  void operator()(Container con, RandomGen& rg)
+  {
+    bool test __attribute__((unused)) = true;
+
+    const int size = con.end() - con.begin();
+    auto dist = std::uniform_int_distribution<>(0, size);
+    const int element = dist(rg);
+
+    std::partial_sort(con.begin(), con.begin() + element, con.end());
+
+    VERIFY( std::is_sorted(con.begin(), con.begin() + element) );
+
+    if (element > 0)
+      {
+        for (int i = element; i < size; ++i)
+         VERIFY( con.val(element - 1) <= con.val(i) );
+      }
+  }
+};
+
+int 
+main()
+{
+  __gnu_test::test_containers<Container>(testPartialSort());
+}
diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/random_test.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/random_test.cc
new file mode 100644 (file)
index 0000000..cca4c56
--- /dev/null
@@ -0,0 +1,67 @@
+// Copyright (C) 2013 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/>.
+
+// { dg-options "-std=gnu++11" }
+// { dg-options "-std=gnu++11 -DSIMULATOR_TEST" { target simulator } }
+// { dg-require-cstdint "" }
+
+// 25.4.1.4 [lib.alg.partial.sort.copy]
+
+#include <algorithm>
+#include <random>
+#include <vector>
+#include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+#include <testsuite_containergen.h>
+
+using __gnu_test::test_container;
+using __gnu_test::random_access_iterator_wrapper;
+
+typedef test_container<int, random_access_iterator_wrapper> Container;
+
+struct testPartialSortCopy
+{
+  template<typename Container, typename RandomGen>
+  void operator()(Container con, RandomGen& rg)
+  {
+    bool test __attribute__((unused)) = true;
+
+    const int size = con.end() - con.begin();
+    auto dist = std::uniform_int_distribution<>(0, size);
+    const int element = dist(rg);
+
+    std::vector<int> outvec(element + 1); // add +1 to avoid empty issues
+
+    Container out(outvec.data(), outvec.data() + element);
+
+    std::partial_sort_copy(con.begin(), con.end(),
+                          out.begin(), out.begin() + element);
+
+    VERIFY( std::is_sorted(out.begin(), out.begin() + element) );
+
+    std::sort(con.begin(), con.end());
+
+    for (int i = 0; i < element; ++i)
+      VERIFY( con.val(i) == out.val(i) );
+  }
+};
+
+int 
+main()
+{
+  __gnu_test::test_containers<Container>(testPartialSortCopy());
+}
diff --git a/libstdc++-v3/testsuite/25_algorithms/sort/random_test.cc b/libstdc++-v3/testsuite/25_algorithms/sort/random_test.cc
new file mode 100644 (file)
index 0000000..ff3d06a
--- /dev/null
@@ -0,0 +1,51 @@
+// Copyright (C) 2013 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/>.
+
+// { dg-options "-std=gnu++11" }
+// { dg-options "-std=gnu++11 -DSIMULATOR_TEST" { target simulator } }
+// { dg-require-cstdint "" }
+
+// 25.4.1 [lib.alg.sort]
+
+#include <algorithm>
+#include <random>
+#include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+#include <testsuite_containergen.h>
+
+using __gnu_test::test_container;
+using __gnu_test::random_access_iterator_wrapper;
+
+typedef test_container<int, random_access_iterator_wrapper> Container;
+
+struct testSort
+{
+  template<typename Container, typename RandomGen>
+  void operator()(Container con, RandomGen&)
+  {
+    bool test __attribute__((unused)) = true;
+
+    std::sort(con.begin(), con.end());
+    VERIFY( std::is_sorted(con.begin(), con.end()) );
+  }
+};
+
+int 
+main()
+{
+  __gnu_test::test_containers<Container>(testSort());
+}
diff --git a/libstdc++-v3/testsuite/util/testsuite_containergen.h b/libstdc++-v3/testsuite/util/testsuite_containergen.h
new file mode 100644 (file)
index 0000000..ff512ac
--- /dev/null
@@ -0,0 +1,97 @@
+// Copyright (C) 2013 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/>.
+
+#ifndef _GLIBCXX_TESTSUITE_CONTAINER_GEN_H
+#define _GLIBCXX_TESTSUITE_CONTAINER_GEN_H
+
+#include <testsuite_container_traits.h>
+#include <random>
+
+namespace __gnu_test
+{
+  template<typename ContainerType, typename Tester, typename RandomGen>
+    void
+    test_single_container(Tester test, RandomGen& rg, int length, int domain)
+    {
+      std::vector<int> values;
+      auto dist = std::uniform_int_distribution<>(0, domain - 1);
+
+      for(int i = 0; i < length; ++i)
+       values.push_back(dist(rg));
+
+      ContainerType con(values.data(), values.data() + length);
+      test(con, rg);
+    }
+
+  template<typename ContainerType, typename Tester, typename RandomGen>
+    void
+    test_special_containers(Tester test, RandomGen& rg, int length)
+    {
+      std::vector<int> values(length);
+      ContainerType con(values.data(), values.data() + length);
+
+      for(int i = 0; i < length; ++i)
+       values[i] = 0;
+      test(con, rg);
+
+      for(int i = 0; i < length; ++i)
+       values[i] = i;
+      test(con, rg);
+
+      for(int i = 0; i < length; ++i)
+       values[i] = -i;
+      test(con, rg);
+    }
+
+  template<typename ContainerType, typename Tester>
+    void
+    test_containers(Tester test)
+    {
+      std::mt19937_64 random_gen;
+      
+#ifdef SIMULATOR_TEST
+      int loops = 10;
+#else
+      int loops = 1000;
+#endif
+
+      for(int i = 0; i < loops; ++i)
+       test_special_containers<ContainerType>(test, random_gen, i);
+
+      for(int i = 1; i < 100; ++i)
+       for(int j = 0; j < loops; ++j)
+         test_single_container<ContainerType>(test, random_gen, i, i);
+     
+      for(int i = 0; i < loops; ++i)
+       {
+         test_single_container<ContainerType>(test, random_gen, 10, 10);
+         test_single_container<ContainerType>(test, random_gen, 100, 10);
+         test_single_container<ContainerType>(test, random_gen, 1000, 10);
+         test_single_container<ContainerType>(test, random_gen, 10, 1000);
+       }
+
+#ifndef SIMULATOR_TEST
+      for(int i = 0; i < 1000; ++i)
+       {
+         test_single_container<ContainerType>(test, random_gen, 10000, 10);
+         test_single_container<ContainerType>(test, random_gen, 10000, 10000);
+       }
+#endif
+    }
+} // namespace __gnu_test
+
+#endif
index 9bb5858..c9dccb7 100644 (file)
@@ -539,6 +539,10 @@ namespace __gnu_test
       return ItType<T>(pos, &bounds);
     }
 
+    const T&
+    val(int pos)
+    { return (bounds.first)[pos]; }
+
     ItType<T>
     begin()
     { return it(bounds.first); }