Move test into test/std subdirectory.

llvm-svn: 224658

4 files changed, 0 insertions, 807 deletions

diff --git a/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
deleted file mode 100644
index cbc0c9b3536..00000000000
--- a/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <string>
-
-// size_type rfind(charT c, size_type pos = npos) const;
-
-#include <string>
-#include <cassert>
-
-#include "min_allocator.h"
-
-template <class S>
-void
-test(const S& s, typename S::value_type c, typename S::size_type pos,
-     typename S::size_type x)
-{
-    assert(s.rfind(c, pos) == x);
-    if (x != S::npos)
-        assert(x <= pos && x + 1 <= s.size());
-}
-
-template <class S>
-void
-test(const S& s, typename S::value_type c, typename S::size_type x)
-{
-    assert(s.rfind(c) == x);
-    if (x != S::npos)
-        assert(x + 1 <= s.size());
-}
-
-int main()
-{
-    {
-    typedef std::string S;
-    test(S(""), 'b', 0, S::npos);
-    test(S(""), 'b', 1, S::npos);
-    test(S("abcde"), 'b', 0, S::npos);
-    test(S("abcde"), 'b', 1, 1);
-    test(S("abcde"), 'b', 2, 1);
-    test(S("abcde"), 'b', 4, 1);
-    test(S("abcde"), 'b', 5, 1);
-    test(S("abcde"), 'b', 6, 1);
-    test(S("abcdeabcde"), 'b', 0, S::npos);
-    test(S("abcdeabcde"), 'b', 1, 1);
-    test(S("abcdeabcde"), 'b', 5, 1);
-    test(S("abcdeabcde"), 'b', 9, 6);
-    test(S("abcdeabcde"), 'b', 10, 6);
-    test(S("abcdeabcde"), 'b', 11, 6);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 0, S::npos);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 1, 1);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 10, 6);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 19, 16);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 20, 16);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 21, 16);
-
-    test(S(""), 'b', S::npos);
-    test(S("abcde"), 'b', 1);
-    test(S("abcdeabcde"), 'b', 6);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 16);
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    test(S(""), 'b', 0, S::npos);
-    test(S(""), 'b', 1, S::npos);
-    test(S("abcde"), 'b', 0, S::npos);
-    test(S("abcde"), 'b', 1, 1);
-    test(S("abcde"), 'b', 2, 1);
-    test(S("abcde"), 'b', 4, 1);
-    test(S("abcde"), 'b', 5, 1);
-    test(S("abcde"), 'b', 6, 1);
-    test(S("abcdeabcde"), 'b', 0, S::npos);
-    test(S("abcdeabcde"), 'b', 1, 1);
-    test(S("abcdeabcde"), 'b', 5, 1);
-    test(S("abcdeabcde"), 'b', 9, 6);
-    test(S("abcdeabcde"), 'b', 10, 6);
-    test(S("abcdeabcde"), 'b', 11, 6);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 0, S::npos);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 1, 1);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 10, 6);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 19, 16);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 20, 16);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 21, 16);
-
-    test(S(""), 'b', S::npos);
-    test(S("abcde"), 'b', 1);
-    test(S("abcdeabcde"), 'b', 6);
-    test(S("abcdeabcdeabcdeabcde"), 'b', 16);
-    }
-#endif
-}
diff --git a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
deleted file mode 100644
index 450aebedd59..00000000000
--- a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <string>
-
-// size_type rfind(const charT* s, size_type pos = npos) const;
-
-#include <string>
-#include <cassert>
-
-#include "min_allocator.h"
-
-template <class S>
-void
-test(const S& s, const typename S::value_type* str, typename S::size_type pos,
-     typename S::size_type x)
-{
-    assert(s.rfind(str, pos) == x);
-    if (x != S::npos)
-    {
-        typename S::size_type n = S::traits_type::length(str);
-        assert(x <= pos && x + n <= s.size());
-    }
-}
-
-template <class S>
-void
-test(const S& s, const typename S::value_type* str, typename S::size_type x)
-{
-    assert(s.rfind(str) == x);
-    if (x != S::npos)
-    {
-        typename S::size_type pos = s.size();
-        typename S::size_type n = S::traits_type::length(str);
-        assert(x <= pos && x + n <= s.size());
-    }
-}
-
-template <class S>
-void test0()
-{
-    test(S(""), "", 0, 0);
-    test(S(""), "abcde", 0, S::npos);
-    test(S(""), "abcdeabcde", 0, S::npos);
-    test(S(""), "abcdeabcdeabcdeabcde", 0, S::npos);
-    test(S(""), "", 1, 0);
-    test(S(""), "abcde", 1, S::npos);
-    test(S(""), "abcdeabcde", 1, S::npos);
-    test(S(""), "abcdeabcdeabcdeabcde", 1, S::npos);
-    test(S("abcde"), "", 0, 0);
-    test(S("abcde"), "abcde", 0, 0);
-    test(S("abcde"), "abcdeabcde", 0, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 0, S::npos);
-    test(S("abcde"), "", 1, 1);
-    test(S("abcde"), "abcde", 1, 0);
-    test(S("abcde"), "abcdeabcde", 1, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 1, S::npos);
-    test(S("abcde"), "", 2, 2);
-    test(S("abcde"), "abcde", 2, 0);
-    test(S("abcde"), "abcdeabcde", 2, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 2, S::npos);
-    test(S("abcde"), "", 4, 4);
-    test(S("abcde"), "abcde", 4, 0);
-    test(S("abcde"), "abcdeabcde", 4, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 4, S::npos);
-    test(S("abcde"), "", 5, 5);
-    test(S("abcde"), "abcde", 5, 0);
-    test(S("abcde"), "abcdeabcde", 5, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 5, S::npos);
-    test(S("abcde"), "", 6, 5);
-    test(S("abcde"), "abcde", 6, 0);
-    test(S("abcde"), "abcdeabcde", 6, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 6, S::npos);
-    test(S("abcdeabcde"), "", 0, 0);
-    test(S("abcdeabcde"), "abcde", 0, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 0, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 0, S::npos);
-    test(S("abcdeabcde"), "", 1, 1);
-    test(S("abcdeabcde"), "abcde", 1, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 1, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 1, S::npos);
-    test(S("abcdeabcde"), "", 5, 5);
-    test(S("abcdeabcde"), "abcde", 5, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 5, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 5, S::npos);
-    test(S("abcdeabcde"), "", 9, 9);
-    test(S("abcdeabcde"), "abcde", 9, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 9, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 9, S::npos);
-    test(S("abcdeabcde"), "", 10, 10);
-    test(S("abcdeabcde"), "abcde", 10, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 10, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 10, S::npos);
-    test(S("abcdeabcde"), "", 11, 10);
-    test(S("abcdeabcde"), "abcde", 11, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 11, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 11, S::npos);
-    test(S("abcdeabcdeabcdeabcde"), "", 0, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 0, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 0, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 0, 0);
-    test(S("abcdeabcdeabcdeabcde"), "", 1, 1);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 1, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 1, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 1, 0);
-    test(S("abcdeabcdeabcdeabcde"), "", 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 10, 0);
-    test(S("abcdeabcdeabcdeabcde"), "", 19, 19);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 19, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 19, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 19, 0);
-    test(S("abcdeabcdeabcdeabcde"), "", 20, 20);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 20, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 20, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 20, 0);
-    test(S("abcdeabcdeabcdeabcde"), "", 21, 20);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 21, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 21, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 21, 0);
-}
-
-template <class S>
-void test1()
-{
-    test(S(""), "", 0);
-    test(S(""), "abcde", S::npos);
-    test(S(""), "abcdeabcde", S::npos);
-    test(S(""), "abcdeabcdeabcdeabcde", S::npos);
-    test(S("abcde"), "", 5);
-    test(S("abcde"), "abcde", 0);
-    test(S("abcde"), "abcdeabcde", S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", S::npos);
-    test(S("abcdeabcde"), "", 10);
-    test(S("abcdeabcde"), "abcde", 5);
-    test(S("abcdeabcde"), "abcdeabcde", 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", S::npos);
-    test(S("abcdeabcdeabcdeabcde"), "", 20);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 0);
-}
-
-int main()
-{
-    {
-    typedef std::string S;
-    test0<S>();
-    test1<S>();
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    test0<S>();
-    test1<S>();
-    }
-#endif
-}
diff --git a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
deleted file mode 100644
index 47baf40b265..00000000000
--- a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
+++ /dev/null
@@ -1,387 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <string>
-
-// size_type rfind(const charT* s, size_type pos, size_type n) const;
-
-#include <string>
-#include <cassert>
-
-#include "min_allocator.h"
-
-template <class S>
-void
-test(const S& s, const typename S::value_type* str, typename S::size_type pos,
-      typename S::size_type n, typename S::size_type x)
-{
-    assert(s.rfind(str, pos, n) == x);
-    if (x != S::npos)
-        assert(x <= pos && x + n <= s.size());
-}
-
-template <class S>
-void test0()
-{
-    test(S(""), "", 0, 0, 0);
-    test(S(""), "abcde", 0, 0, 0);
-    test(S(""), "abcde", 0, 1, S::npos);
-    test(S(""), "abcde", 0, 2, S::npos);
-    test(S(""), "abcde", 0, 4, S::npos);
-    test(S(""), "abcde", 0, 5, S::npos);
-    test(S(""), "abcdeabcde", 0, 0, 0);
-    test(S(""), "abcdeabcde", 0, 1, S::npos);
-    test(S(""), "abcdeabcde", 0, 5, S::npos);
-    test(S(""), "abcdeabcde", 0, 9, S::npos);
-    test(S(""), "abcdeabcde", 0, 10, S::npos);
-    test(S(""), "abcdeabcdeabcdeabcde", 0, 0, 0);
-    test(S(""), "abcdeabcdeabcdeabcde", 0, 1, S::npos);
-    test(S(""), "abcdeabcdeabcdeabcde", 0, 10, S::npos);
-    test(S(""), "abcdeabcdeabcdeabcde", 0, 19, S::npos);
-    test(S(""), "abcdeabcdeabcdeabcde", 0, 20, S::npos);
-    test(S(""), "", 1, 0, 0);
-    test(S(""), "abcde", 1, 0, 0);
-    test(S(""), "abcde", 1, 1, S::npos);
-    test(S(""), "abcde", 1, 2, S::npos);
-    test(S(""), "abcde", 1, 4, S::npos);
-    test(S(""), "abcde", 1, 5, S::npos);
-    test(S(""), "abcdeabcde", 1, 0, 0);
-    test(S(""), "abcdeabcde", 1, 1, S::npos);
-    test(S(""), "abcdeabcde", 1, 5, S::npos);
-    test(S(""), "abcdeabcde", 1, 9, S::npos);
-    test(S(""), "abcdeabcde", 1, 10, S::npos);
-    test(S(""), "abcdeabcdeabcdeabcde", 1, 0, 0);
-    test(S(""), "abcdeabcdeabcdeabcde", 1, 1, S::npos);
-    test(S(""), "abcdeabcdeabcdeabcde", 1, 10, S::npos);
-    test(S(""), "abcdeabcdeabcdeabcde", 1, 19, S::npos);
-    test(S(""), "abcdeabcdeabcdeabcde", 1, 20, S::npos);
-    test(S("abcde"), "", 0, 0, 0);
-    test(S("abcde"), "abcde", 0, 0, 0);
-    test(S("abcde"), "abcde", 0, 1, 0);
-    test(S("abcde"), "abcde", 0, 2, 0);
-    test(S("abcde"), "abcde", 0, 4, 0);
-    test(S("abcde"), "abcde", 0, 5, 0);
-    test(S("abcde"), "abcdeabcde", 0, 0, 0);
-    test(S("abcde"), "abcdeabcde", 0, 1, 0);
-    test(S("abcde"), "abcdeabcde", 0, 5, 0);
-    test(S("abcde"), "abcdeabcde", 0, 9, S::npos);
-    test(S("abcde"), "abcdeabcde", 0, 10, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 0, 0, 0);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 0, 1, 0);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 0, 10, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 0, 19, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 0, 20, S::npos);
-    test(S("abcde"), "", 1, 0, 1);
-    test(S("abcde"), "abcde", 1, 0, 1);
-    test(S("abcde"), "abcde", 1, 1, 0);
-    test(S("abcde"), "abcde", 1, 2, 0);
-    test(S("abcde"), "abcde", 1, 4, 0);
-    test(S("abcde"), "abcde", 1, 5, 0);
-    test(S("abcde"), "abcdeabcde", 1, 0, 1);
-    test(S("abcde"), "abcdeabcde", 1, 1, 0);
-    test(S("abcde"), "abcdeabcde", 1, 5, 0);
-    test(S("abcde"), "abcdeabcde", 1, 9, S::npos);
-    test(S("abcde"), "abcdeabcde", 1, 10, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 1, 0, 1);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 1, 1, 0);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 1, 10, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 1, 19, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 1, 20, S::npos);
-    test(S("abcde"), "", 2, 0, 2);
-    test(S("abcde"), "abcde", 2, 0, 2);
-    test(S("abcde"), "abcde", 2, 1, 0);
-    test(S("abcde"), "abcde", 2, 2, 0);
-    test(S("abcde"), "abcde", 2, 4, 0);
-    test(S("abcde"), "abcde", 2, 5, 0);
-    test(S("abcde"), "abcdeabcde", 2, 0, 2);
-    test(S("abcde"), "abcdeabcde", 2, 1, 0);
-    test(S("abcde"), "abcdeabcde", 2, 5, 0);
-    test(S("abcde"), "abcdeabcde", 2, 9, S::npos);
-    test(S("abcde"), "abcdeabcde", 2, 10, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 2, 0, 2);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 2, 1, 0);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 2, 10, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 2, 19, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 2, 20, S::npos);
-    test(S("abcde"), "", 4, 0, 4);
-    test(S("abcde"), "abcde", 4, 0, 4);
-    test(S("abcde"), "abcde", 4, 1, 0);
-    test(S("abcde"), "abcde", 4, 2, 0);
-    test(S("abcde"), "abcde", 4, 4, 0);
-    test(S("abcde"), "abcde", 4, 5, 0);
-    test(S("abcde"), "abcdeabcde", 4, 0, 4);
-    test(S("abcde"), "abcdeabcde", 4, 1, 0);
-    test(S("abcde"), "abcdeabcde", 4, 5, 0);
-    test(S("abcde"), "abcdeabcde", 4, 9, S::npos);
-    test(S("abcde"), "abcdeabcde", 4, 10, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 4, 0, 4);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 4, 1, 0);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 4, 10, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 4, 19, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 4, 20, S::npos);
-    test(S("abcde"), "", 5, 0, 5);
-    test(S("abcde"), "abcde", 5, 0, 5);
-    test(S("abcde"), "abcde", 5, 1, 0);
-    test(S("abcde"), "abcde", 5, 2, 0);
-}
-
-template <class S>
-void test1()
-{
-    test(S("abcde"), "abcde", 5, 4, 0);
-    test(S("abcde"), "abcde", 5, 5, 0);
-    test(S("abcde"), "abcdeabcde", 5, 0, 5);
-    test(S("abcde"), "abcdeabcde", 5, 1, 0);
-    test(S("abcde"), "abcdeabcde", 5, 5, 0);
-    test(S("abcde"), "abcdeabcde", 5, 9, S::npos);
-    test(S("abcde"), "abcdeabcde", 5, 10, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 5, 0, 5);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 5, 1, 0);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 5, 10, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 5, 19, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 5, 20, S::npos);
-    test(S("abcde"), "", 6, 0, 5);
-    test(S("abcde"), "abcde", 6, 0, 5);
-    test(S("abcde"), "abcde", 6, 1, 0);
-    test(S("abcde"), "abcde", 6, 2, 0);
-    test(S("abcde"), "abcde", 6, 4, 0);
-    test(S("abcde"), "abcde", 6, 5, 0);
-    test(S("abcde"), "abcdeabcde", 6, 0, 5);
-    test(S("abcde"), "abcdeabcde", 6, 1, 0);
-    test(S("abcde"), "abcdeabcde", 6, 5, 0);
-    test(S("abcde"), "abcdeabcde", 6, 9, S::npos);
-    test(S("abcde"), "abcdeabcde", 6, 10, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 6, 0, 5);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 6, 1, 0);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 6, 10, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 6, 19, S::npos);
-    test(S("abcde"), "abcdeabcdeabcdeabcde", 6, 20, S::npos);
-    test(S("abcdeabcde"), "", 0, 0, 0);
-    test(S("abcdeabcde"), "abcde", 0, 0, 0);
-    test(S("abcdeabcde"), "abcde", 0, 1, 0);
-    test(S("abcdeabcde"), "abcde", 0, 2, 0);
-    test(S("abcdeabcde"), "abcde", 0, 4, 0);
-    test(S("abcdeabcde"), "abcde", 0, 5, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 0, 0, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 0, 1, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 0, 5, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 0, 9, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 0, 10, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 0, 0, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 0, 1, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 0, 10, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 0, 19, S::npos);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 0, 20, S::npos);
-    test(S("abcdeabcde"), "", 1, 0, 1);
-    test(S("abcdeabcde"), "abcde", 1, 0, 1);
-    test(S("abcdeabcde"), "abcde", 1, 1, 0);
-    test(S("abcdeabcde"), "abcde", 1, 2, 0);
-    test(S("abcdeabcde"), "abcde", 1, 4, 0);
-    test(S("abcdeabcde"), "abcde", 1, 5, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 1, 0, 1);
-    test(S("abcdeabcde"), "abcdeabcde", 1, 1, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 1, 5, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 1, 9, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 1, 10, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 1, 0, 1);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 1, 1, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 1, 10, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 1, 19, S::npos);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 1, 20, S::npos);
-    test(S("abcdeabcde"), "", 5, 0, 5);
-    test(S("abcdeabcde"), "abcde", 5, 0, 5);
-    test(S("abcdeabcde"), "abcde", 5, 1, 5);
-    test(S("abcdeabcde"), "abcde", 5, 2, 5);
-    test(S("abcdeabcde"), "abcde", 5, 4, 5);
-    test(S("abcdeabcde"), "abcde", 5, 5, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 5, 0, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 5, 1, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 5, 5, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 5, 9, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 5, 10, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 5, 0, 5);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 5, 1, 5);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 5, 10, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 5, 19, S::npos);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 5, 20, S::npos);
-    test(S("abcdeabcde"), "", 9, 0, 9);
-    test(S("abcdeabcde"), "abcde", 9, 0, 9);
-    test(S("abcdeabcde"), "abcde", 9, 1, 5);
-    test(S("abcdeabcde"), "abcde", 9, 2, 5);
-    test(S("abcdeabcde"), "abcde", 9, 4, 5);
-    test(S("abcdeabcde"), "abcde", 9, 5, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 9, 0, 9);
-    test(S("abcdeabcde"), "abcdeabcde", 9, 1, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 9, 5, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 9, 9, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 9, 10, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 9, 0, 9);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 9, 1, 5);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 9, 10, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 9, 19, S::npos);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 9, 20, S::npos);
-    test(S("abcdeabcde"), "", 10, 0, 10);
-    test(S("abcdeabcde"), "abcde", 10, 0, 10);
-    test(S("abcdeabcde"), "abcde", 10, 1, 5);
-    test(S("abcdeabcde"), "abcde", 10, 2, 5);
-    test(S("abcdeabcde"), "abcde", 10, 4, 5);
-    test(S("abcdeabcde"), "abcde", 10, 5, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 10, 0, 10);
-    test(S("abcdeabcde"), "abcdeabcde", 10, 1, 5);
-}
-
-template <class S>
-void test2()
-{
-    test(S("abcdeabcde"), "abcdeabcde", 10, 5, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 10, 9, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 10, 10, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 10, 0, 10);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 10, 1, 5);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 10, 10, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 10, 19, S::npos);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 10, 20, S::npos);
-    test(S("abcdeabcde"), "", 11, 0, 10);
-    test(S("abcdeabcde"), "abcde", 11, 0, 10);
-    test(S("abcdeabcde"), "abcde", 11, 1, 5);
-    test(S("abcdeabcde"), "abcde", 11, 2, 5);
-    test(S("abcdeabcde"), "abcde", 11, 4, 5);
-    test(S("abcdeabcde"), "abcde", 11, 5, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 11, 0, 10);
-    test(S("abcdeabcde"), "abcdeabcde", 11, 1, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 11, 5, 5);
-    test(S("abcdeabcde"), "abcdeabcde", 11, 9, 0);
-    test(S("abcdeabcde"), "abcdeabcde", 11, 10, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 11, 0, 10);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 11, 1, 5);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 11, 10, 0);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 11, 19, S::npos);
-    test(S("abcdeabcde"), "abcdeabcdeabcdeabcde", 11, 20, S::npos);
-    test(S("abcdeabcdeabcdeabcde"), "", 0, 0, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 0, 0, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 0, 1, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 0, 2, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 0, 4, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 0, 5, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 0, 0, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 0, 1, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 0, 5, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 0, 9, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 0, 10, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 0, 0, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 0, 1, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 0, 10, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 0, 19, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 0, 20, 0);
-    test(S("abcdeabcdeabcdeabcde"), "", 1, 0, 1);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 1, 0, 1);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 1, 1, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 1, 2, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 1, 4, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 1, 5, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 1, 0, 1);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 1, 1, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 1, 5, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 1, 9, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 1, 10, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 1, 0, 1);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 1, 1, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 1, 10, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 1, 19, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 1, 20, 0);
-    test(S("abcdeabcdeabcdeabcde"), "", 10, 0, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 10, 0, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 10, 1, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 10, 2, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 10, 4, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 10, 5, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 10, 0, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 10, 1, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 10, 5, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 10, 9, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 10, 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 10, 0, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 10, 1, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 10, 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 10, 19, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 10, 20, 0);
-    test(S("abcdeabcdeabcdeabcde"), "", 19, 0, 19);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 19, 0, 19);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 19, 1, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 19, 2, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 19, 4, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 19, 5, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 19, 0, 19);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 19, 1, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 19, 5, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 19, 9, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 19, 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 19, 0, 19);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 19, 1, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 19, 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 19, 19, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 19, 20, 0);
-    test(S("abcdeabcdeabcdeabcde"), "", 20, 0, 20);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 20, 0, 20);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 20, 1, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 20, 2, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 20, 4, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 20, 5, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 20, 0, 20);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 20, 1, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 20, 5, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 20, 9, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 20, 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 20, 0, 20);
-}
-
-template <class S>
-void test3()
-{
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 20, 1, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 20, 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 20, 19, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 20, 20, 0);
-    test(S("abcdeabcdeabcdeabcde"), "", 21, 0, 20);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 21, 0, 20);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 21, 1, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 21, 2, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 21, 4, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcde", 21, 5, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 21, 0, 20);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 21, 1, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 21, 5, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 21, 9, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcde", 21, 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 21, 0, 20);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 21, 1, 15);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 21, 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 21, 19, 0);
-    test(S("abcdeabcdeabcdeabcde"), "abcdeabcdeabcdeabcde", 21, 20, 0);
-}
-
-int main()
-{
-    {
-    typedef std::string S;
-    test0<S>();
-    test1<S>();
-    test2<S>();
-    test3<S>();
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    test0<S>();
-    test1<S>();
-    test2<S>();
-    test3<S>();
-    }
-#endif
-}
diff --git a/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
deleted file mode 100644
index 05e6e517423..00000000000
--- a/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <string>
-
-// size_type rfind(const basic_string& str, size_type pos = npos) const;
-
-#include <string>
-#include <cassert>
-
-#include "min_allocator.h"
-
-template <class S>
-void
-test(const S& s, const S& str, typename S::size_type pos, typename S::size_type x)
-{
-    assert(s.rfind(str, pos) == x);
-    if (x != S::npos)
-        assert(x <= pos && x + str.size() <= s.size());
-}
-
-template <class S>
-void
-test(const S& s, const S& str, typename S::size_type x)
-{
-    assert(s.rfind(str) == x);
-    if (x != S::npos)
-        assert(0 <= x && x + str.size() <= s.size());
-}
-
-template <class S>
-void test0()
-{
-    test(S(""), S(""), 0, 0);
-    test(S(""), S("abcde"), 0, S::npos);
-    test(S(""), S("abcdeabcde"), 0, S::npos);
-    test(S(""), S("abcdeabcdeabcdeabcde"), 0, S::npos);
-    test(S(""), S(""), 1, 0);
-    test(S(""), S("abcde"), 1, S::npos);
-    test(S(""), S("abcdeabcde"), 1, S::npos);
-    test(S(""), S("abcdeabcdeabcdeabcde"), 1, S::npos);
-    test(S("abcde"), S(""), 0, 0);
-    test(S("abcde"), S("abcde"), 0, 0);
-    test(S("abcde"), S("abcdeabcde"), 0, S::npos);
-    test(S("abcde"), S("abcdeabcdeabcdeabcde"), 0, S::npos);
-    test(S("abcde"), S(""), 1, 1);
-    test(S("abcde"), S("abcde"), 1, 0);
-    test(S("abcde"), S("abcdeabcde"), 1, S::npos);
-    test(S("abcde"), S("abcdeabcdeabcdeabcde"), 1, S::npos);
-    test(S("abcde"), S(""), 2, 2);
-    test(S("abcde"), S("abcde"), 2, 0);
-    test(S("abcde"), S("abcdeabcde"), 2, S::npos);
-    test(S("abcde"), S("abcdeabcdeabcdeabcde"), 2, S::npos);
-    test(S("abcde"), S(""), 4, 4);
-    test(S("abcde"), S("abcde"), 4, 0);
-    test(S("abcde"), S("abcdeabcde"), 4, S::npos);
-    test(S("abcde"), S("abcdeabcdeabcdeabcde"), 4, S::npos);
-    test(S("abcde"), S(""), 5, 5);
-    test(S("abcde"), S("abcde"), 5, 0);
-    test(S("abcde"), S("abcdeabcde"), 5, S::npos);
-    test(S("abcde"), S("abcdeabcdeabcdeabcde"), 5, S::npos);
-    test(S("abcde"), S(""), 6, 5);
-    test(S("abcde"), S("abcde"), 6, 0);
-    test(S("abcde"), S("abcdeabcde"), 6, S::npos);
-    test(S("abcde"), S("abcdeabcdeabcdeabcde"), 6, S::npos);
-    test(S("abcdeabcde"), S(""), 0, 0);
-    test(S("abcdeabcde"), S("abcde"), 0, 0);
-    test(S("abcdeabcde"), S("abcdeabcde"), 0, 0);
-    test(S("abcdeabcde"), S("abcdeabcdeabcdeabcde"), 0, S::npos);
-    test(S("abcdeabcde"), S(""), 1, 1);
-    test(S("abcdeabcde"), S("abcde"), 1, 0);
-    test(S("abcdeabcde"), S("abcdeabcde"), 1, 0);
-    test(S("abcdeabcde"), S("abcdeabcdeabcdeabcde"), 1, S::npos);
-    test(S("abcdeabcde"), S(""), 5, 5);
-    test(S("abcdeabcde"), S("abcde"), 5, 5);
-    test(S("abcdeabcde"), S("abcdeabcde"), 5, 0);
-    test(S("abcdeabcde"), S("abcdeabcdeabcdeabcde"), 5, S::npos);
-    test(S("abcdeabcde"), S(""), 9, 9);
-    test(S("abcdeabcde"), S("abcde"), 9, 5);
-    test(S("abcdeabcde"), S("abcdeabcde"), 9, 0);
-    test(S("abcdeabcde"), S("abcdeabcdeabcdeabcde"), 9, S::npos);
-    test(S("abcdeabcde"), S(""), 10, 10);
-    test(S("abcdeabcde"), S("abcde"), 10, 5);
-    test(S("abcdeabcde"), S("abcdeabcde"), 10, 0);
-    test(S("abcdeabcde"), S("abcdeabcdeabcdeabcde"), 10, S::npos);
-    test(S("abcdeabcde"), S(""), 11, 10);
-    test(S("abcdeabcde"), S("abcde"), 11, 5);
-    test(S("abcdeabcde"), S("abcdeabcde"), 11, 0);
-    test(S("abcdeabcde"), S("abcdeabcdeabcdeabcde"), 11, S::npos);
-    test(S("abcdeabcdeabcdeabcde"), S(""), 0, 0);
-    test(S("abcdeabcdeabcdeabcde"), S("abcde"), 0, 0);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcde"), 0, 0);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcdeabcdeabcde"), 0, 0);
-    test(S("abcdeabcdeabcdeabcde"), S(""), 1, 1);
-    test(S("abcdeabcdeabcdeabcde"), S("abcde"), 1, 0);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcde"), 1, 0);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcdeabcdeabcde"), 1, 0);
-    test(S("abcdeabcdeabcdeabcde"), S(""), 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), S("abcde"), 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcde"), 10, 10);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcdeabcdeabcde"), 10, 0);
-    test(S("abcdeabcdeabcdeabcde"), S(""), 19, 19);
-    test(S("abcdeabcdeabcdeabcde"), S("abcde"), 19, 15);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcde"), 19, 10);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcdeabcdeabcde"), 19, 0);
-    test(S("abcdeabcdeabcdeabcde"), S(""), 20, 20);
-    test(S("abcdeabcdeabcdeabcde"), S("abcde"), 20, 15);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcde"), 20, 10);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcdeabcdeabcde"), 20, 0);
-    test(S("abcdeabcdeabcdeabcde"), S(""), 21, 20);
-    test(S("abcdeabcdeabcdeabcde"), S("abcde"), 21, 15);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcde"), 21, 10);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcdeabcdeabcde"), 21, 0);
-}
-
-template <class S>
-void test1()
-{
-    test(S(""), S(""), 0);
-    test(S(""), S("abcde"), S::npos);
-    test(S(""), S("abcdeabcde"), S::npos);
-    test(S(""), S("abcdeabcdeabcdeabcde"), S::npos);
-    test(S("abcde"), S(""), 5);
-    test(S("abcde"), S("abcde"), 0);
-    test(S("abcde"), S("abcdeabcde"), S::npos);
-    test(S("abcde"), S("abcdeabcdeabcdeabcde"), S::npos);
-    test(S("abcdeabcde"), S(""), 10);
-    test(S("abcdeabcde"), S("abcde"), 5);
-    test(S("abcdeabcde"), S("abcdeabcde"), 0);
-    test(S("abcdeabcde"), S("abcdeabcdeabcdeabcde"), S::npos);
-    test(S("abcdeabcdeabcdeabcde"), S(""), 20);
-    test(S("abcdeabcdeabcdeabcde"), S("abcde"), 15);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcde"), 10);
-    test(S("abcdeabcdeabcdeabcde"), S("abcdeabcdeabcdeabcde"), 0);
-}
-
-int main()
-{
-    {
-    typedef std::string S;
-    test0<S>();
-    test1<S>();
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    test0<S>();
-    test1<S>();
-    }
-#endif
-}