Move test into test/std subdirectory.

llvm-svn: 224658

10 files changed, 0 insertions, 848 deletions

diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp
deleted file mode 100644
index 6c2929d7f1d..00000000000
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp
+++ /dev/null
@@ -1,50 +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>
-
-// Call erase(const_iterator position) with end()
-
-#if _LIBCPP_DEBUG >= 1
-
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
-
-#include <string>
-#include <cassert>
-#include <cstdlib>
-#include <exception>
-
-#include "min_allocator.h"
-
-int main()
-{
-    {
-    std::string l1("123");
-    std::string::const_iterator i = l1.end();
-    l1.erase(i);
-    assert(false);
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S l1("123");
-    S::const_iterator i = l1.end();
-    l1.erase(i);
-    assert(false);
-    }
-#endif
-}
-
-#else
-
-int main()
-{
-}
-
-#endif
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp
deleted file mode 100644
index d20fcd4623b..00000000000
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp
+++ /dev/null
@@ -1,52 +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>
-
-// Call erase(const_iterator position) with iterator from another container
-
-#if _LIBCPP_DEBUG >= 1
-
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
-
-#include <string>
-#include <cassert>
-#include <cstdlib>
-#include <exception>
-
-#include "min_allocator.h"
-
-int main()
-{
-    {
-    std::string l1("123");
-    std::string l2("123");
-    std::string::const_iterator i = l2.begin();
-    l1.erase(i);
-    assert(false);
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S l1("123");
-    S l2("123");
-    S::const_iterator i = l2.begin();
-    l1.erase(i);
-    assert(false);
-    }
-#endif
-}
-
-#else
-
-int main()
-{
-}
-
-#endif
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp
deleted file mode 100644
index 5015241ad63..00000000000
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp
+++ /dev/null
@@ -1,50 +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>
-
-// Call erase(const_iterator first, const_iterator last); with first iterator from another container
-
-#if _LIBCPP_DEBUG >= 1
-
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
-
-#include <string>
-#include <cassert>
-#include <exception>
-#include <cstdlib>
-
-#include "min_allocator.h"
-
-int main()
-{
-    {
-    std::string l1("123");
-    std::string l2("123");
-    std::string::iterator i = l1.erase(l2.cbegin(), l1.cbegin()+1);
-    assert(false);
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S l1("123");
-    S l2("123");
-    S::iterator i = l1.erase(l2.cbegin(), l1.cbegin()+1);
-    assert(false);
-    }
-#endif
-}
-
-#else
-
-int main()
-{
-}
-
-#endif
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp
deleted file mode 100644
index 6a23bf88ca5..00000000000
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp
+++ /dev/null
@@ -1,50 +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>
-
-// Call erase(const_iterator first, const_iterator last); with second iterator from another container
-
-#if _LIBCPP_DEBUG >= 1
-
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
-
-#include <string>
-#include <cassert>
-#include <exception>
-#include <cstdlib>
-
-#include "min_allocator.h"
-
-int main()
-{
-    {
-    std::string l1("123");
-    std::string l2("123");
-    std::string::iterator i = l1.erase(l1.cbegin(), l2.cbegin()+1);
-    assert(false);
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S l1("123");
-    S l2("123");
-    S::iterator i = l1.erase(l1.cbegin(), l2.cbegin()+1);
-    assert(false);
-    }
-#endif
-}
-
-#else
-
-int main()
-{
-}
-
-#endif
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp
deleted file mode 100644
index a8443818aea..00000000000
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp
+++ /dev/null
@@ -1,50 +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>
-
-// Call erase(const_iterator first, const_iterator last); with both iterators from another container
-
-#if _LIBCPP_DEBUG >= 1
-
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
-
-#include <string>
-#include <cassert>
-#include <exception>
-#include <cstdlib>
-
-#include "min_allocator.h"
-
-int main()
-{
-    {
-    std::string l1("123");
-    std::string l2("123");
-    std::string::iterator i = l1.erase(l2.cbegin(), l2.cbegin()+1);
-    assert(false);
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S l1("123");
-    S l2("123");
-    S::iterator i = l1.erase(l2.cbegin(), l2.cbegin()+1);
-    assert(false);
-    }
-#endif
-}
-
-#else
-
-int main()
-{
-}
-
-#endif
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp
deleted file mode 100644
index 0549e816b44..00000000000
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp
+++ /dev/null
@@ -1,48 +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>
-
-// Call erase(const_iterator first, const_iterator last); with a bad range
-
-#if _LIBCPP_DEBUG >= 1
-
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
-
-#include <string>
-#include <cassert>
-#include <exception>
-#include <cstdlib>
-
-#include "min_allocator.h"
-
-int main()
-{
-    {
-    std::string l1("123");
-    std::string::iterator i = l1.erase(l1.cbegin()+1, l1.cbegin());
-    assert(false);
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S l1("123");
-    S::iterator i = l1.erase(l1.cbegin()+1, l1.cbegin());
-    assert(false);
-    }
-#endif
-}
-
-#else
-
-int main()
-{
-}
-
-#endif
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
deleted file mode 100644
index c44db71ae3b..00000000000
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
+++ /dev/null
@@ -1,64 +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>
-
-// iterator erase(const_iterator p);
-
-#include <string>
-#include <cassert>
-
-#include "min_allocator.h"
-
-template <class S>
-void
-test(S s, typename S::difference_type pos, S expected)
-{
-    typename S::const_iterator p = s.begin() + pos;
-    typename S::iterator i = s.erase(p);
-    assert(s.__invariants());
-    assert(s == expected);
-    assert(i - s.begin() == pos);
-}
-
-int main()
-{
-    {
-    typedef std::string S;
-    test(S("abcde"), 0, S("bcde"));
-    test(S("abcde"), 1, S("acde"));
-    test(S("abcde"), 2, S("abde"));
-    test(S("abcde"), 4, S("abcd"));
-    test(S("abcdefghij"), 0, S("bcdefghij"));
-    test(S("abcdefghij"), 1, S("acdefghij"));
-    test(S("abcdefghij"), 5, S("abcdeghij"));
-    test(S("abcdefghij"), 9, S("abcdefghi"));
-    test(S("abcdefghijklmnopqrst"), 0, S("bcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, S("acdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, S("abcdefghijlmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 19, S("abcdefghijklmnopqrs"));
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    test(S("abcde"), 0, S("bcde"));
-    test(S("abcde"), 1, S("acde"));
-    test(S("abcde"), 2, S("abde"));
-    test(S("abcde"), 4, S("abcd"));
-    test(S("abcdefghij"), 0, S("bcdefghij"));
-    test(S("abcdefghij"), 1, S("acdefghij"));
-    test(S("abcdefghij"), 5, S("abcdeghij"));
-    test(S("abcdefghij"), 9, S("abcdefghi"));
-    test(S("abcdefghijklmnopqrst"), 0, S("bcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, S("acdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, S("abcdefghijlmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 19, S("abcdefghijklmnopqrs"));
-    }
-#endif
-}
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp
deleted file mode 100644
index dbe6d7ba0e7..00000000000
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp
+++ /dev/null
@@ -1,149 +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>
-
-// iterator erase(const_iterator first, const_iterator last);
-
-#include <string>
-#include <cassert>
-
-#include "min_allocator.h"
-
-template <class S>
-void
-test(S s, typename S::difference_type pos, typename S::difference_type n, S expected)
-{
-    typename S::const_iterator first = s.cbegin() + pos;
-    typename S::const_iterator last = s.cbegin() + pos + n;
-    typename S::iterator i = s.erase(first, last);
-    assert(s.__invariants());
-    assert(s == expected);
-    assert(i - s.begin() == pos);
-}
-
-int main()
-{
-    {
-    typedef std::string S;
-    test(S(""), 0, 0, S(""));
-    test(S("abcde"), 0, 0, S("abcde"));
-    test(S("abcde"), 0, 1, S("bcde"));
-    test(S("abcde"), 0, 2, S("cde"));
-    test(S("abcde"), 0, 4, S("e"));
-    test(S("abcde"), 0, 5, S(""));
-    test(S("abcde"), 1, 0, S("abcde"));
-    test(S("abcde"), 1, 1, S("acde"));
-    test(S("abcde"), 1, 2, S("ade"));
-    test(S("abcde"), 1, 3, S("ae"));
-    test(S("abcde"), 1, 4, S("a"));
-    test(S("abcde"), 2, 0, S("abcde"));
-    test(S("abcde"), 2, 1, S("abde"));
-    test(S("abcde"), 2, 2, S("abe"));
-    test(S("abcde"), 2, 3, S("ab"));
-    test(S("abcde"), 4, 0, S("abcde"));
-    test(S("abcde"), 4, 1, S("abcd"));
-    test(S("abcde"), 5, 0, S("abcde"));
-    test(S("abcdefghij"), 0, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 0, 1, S("bcdefghij"));
-    test(S("abcdefghij"), 0, 5, S("fghij"));
-    test(S("abcdefghij"), 0, 9, S("j"));
-    test(S("abcdefghij"), 0, 10, S(""));
-    test(S("abcdefghij"), 1, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 1, 1, S("acdefghij"));
-    test(S("abcdefghij"), 1, 4, S("afghij"));
-    test(S("abcdefghij"), 1, 8, S("aj"));
-    test(S("abcdefghij"), 1, 9, S("a"));
-    test(S("abcdefghij"), 5, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 5, 1, S("abcdeghij"));
-    test(S("abcdefghij"), 5, 2, S("abcdehij"));
-    test(S("abcdefghij"), 5, 4, S("abcdej"));
-    test(S("abcdefghij"), 5, 5, S("abcde"));
-    test(S("abcdefghij"), 9, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 9, 1, S("abcdefghi"));
-    test(S("abcdefghij"), 10, 0, S("abcdefghij"));
-    test(S("abcdefghijklmnopqrst"), 0, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 0, 1, S("bcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 0, 10, S("klmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 0, 19, S("t"));
-    test(S("abcdefghijklmnopqrst"), 0, 20, S(""));
-    test(S("abcdefghijklmnopqrst"), 1, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, 1, S("acdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, 9, S("aklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, 18, S("at"));
-    test(S("abcdefghijklmnopqrst"), 1, 19, S("a"));
-    test(S("abcdefghijklmnopqrst"), 10, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, 1, S("abcdefghijlmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, 5, S("abcdefghijpqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, 9, S("abcdefghijt"));
-    test(S("abcdefghijklmnopqrst"), 10, 10, S("abcdefghij"));
-    test(S("abcdefghijklmnopqrst"), 19, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 19, 1, S("abcdefghijklmnopqrs"));
-    test(S("abcdefghijklmnopqrst"), 20, 0, S("abcdefghijklmnopqrst"));
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    test(S(""), 0, 0, S(""));
-    test(S("abcde"), 0, 0, S("abcde"));
-    test(S("abcde"), 0, 1, S("bcde"));
-    test(S("abcde"), 0, 2, S("cde"));
-    test(S("abcde"), 0, 4, S("e"));
-    test(S("abcde"), 0, 5, S(""));
-    test(S("abcde"), 1, 0, S("abcde"));
-    test(S("abcde"), 1, 1, S("acde"));
-    test(S("abcde"), 1, 2, S("ade"));
-    test(S("abcde"), 1, 3, S("ae"));
-    test(S("abcde"), 1, 4, S("a"));
-    test(S("abcde"), 2, 0, S("abcde"));
-    test(S("abcde"), 2, 1, S("abde"));
-    test(S("abcde"), 2, 2, S("abe"));
-    test(S("abcde"), 2, 3, S("ab"));
-    test(S("abcde"), 4, 0, S("abcde"));
-    test(S("abcde"), 4, 1, S("abcd"));
-    test(S("abcde"), 5, 0, S("abcde"));
-    test(S("abcdefghij"), 0, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 0, 1, S("bcdefghij"));
-    test(S("abcdefghij"), 0, 5, S("fghij"));
-    test(S("abcdefghij"), 0, 9, S("j"));
-    test(S("abcdefghij"), 0, 10, S(""));
-    test(S("abcdefghij"), 1, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 1, 1, S("acdefghij"));
-    test(S("abcdefghij"), 1, 4, S("afghij"));
-    test(S("abcdefghij"), 1, 8, S("aj"));
-    test(S("abcdefghij"), 1, 9, S("a"));
-    test(S("abcdefghij"), 5, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 5, 1, S("abcdeghij"));
-    test(S("abcdefghij"), 5, 2, S("abcdehij"));
-    test(S("abcdefghij"), 5, 4, S("abcdej"));
-    test(S("abcdefghij"), 5, 5, S("abcde"));
-    test(S("abcdefghij"), 9, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 9, 1, S("abcdefghi"));
-    test(S("abcdefghij"), 10, 0, S("abcdefghij"));
-    test(S("abcdefghijklmnopqrst"), 0, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 0, 1, S("bcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 0, 10, S("klmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 0, 19, S("t"));
-    test(S("abcdefghijklmnopqrst"), 0, 20, S(""));
-    test(S("abcdefghijklmnopqrst"), 1, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, 1, S("acdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, 9, S("aklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, 18, S("at"));
-    test(S("abcdefghijklmnopqrst"), 1, 19, S("a"));
-    test(S("abcdefghijklmnopqrst"), 10, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, 1, S("abcdefghijlmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, 5, S("abcdefghijpqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, 9, S("abcdefghijt"));
-    test(S("abcdefghijklmnopqrst"), 10, 10, S("abcdefghij"));
-    test(S("abcdefghijklmnopqrst"), 19, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 19, 1, S("abcdefghijklmnopqrs"));
-    test(S("abcdefghijklmnopqrst"), 20, 0, S("abcdefghijklmnopqrst"));
-    }
-#endif
-}
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
deleted file mode 100644
index 790ce40b0a0..00000000000
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
+++ /dev/null
@@ -1,55 +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>
-
-// void pop_back();
-
-#if _LIBCPP_DEBUG >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
-#endif
-
-#include <string>
-#include <cassert>
-
-#include "min_allocator.h"
-
-template <class S>
-void
-test(S s, S expected)
-{
-    s.pop_back();
-    assert(s.__invariants());
-    assert(s == expected);
-}
-
-int main()
-{
-    {
-    typedef std::string S;
-    test(S("abcde"), S("abcd"));
-    test(S("abcdefghij"), S("abcdefghi"));
-    test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrs"));
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    test(S("abcde"), S("abcd"));
-    test(S("abcdefghij"), S("abcdefghi"));
-    test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrs"));
-    }
-#endif
-#if _LIBCPP_DEBUG >= 1
-    {
-        std::string s;
-        s.pop_back();
-        assert(false);
-    }
-#endif        
-}
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
deleted file mode 100644
index bc9ec1cf825..00000000000
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
+++ /dev/null
@@ -1,280 +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>
-
-// basic_string<charT,traits,Allocator>&
-//   erase(size_type pos = 0, size_type n = npos);
-
-#include <string>
-#include <stdexcept>
-#include <cassert>
-
-#include "min_allocator.h"
-
-template <class S>
-void
-test(S s, typename S::size_type pos, typename S::size_type n, S expected)
-{
-    typename S::size_type old_size = s.size();
-    S s0 = s;
-    try
-    {
-        s.erase(pos, n);
-        assert(s.__invariants());
-        assert(pos <= old_size);
-        assert(s == expected);
-    }
-    catch (std::out_of_range&)
-    {
-        assert(pos > old_size);
-        assert(s == s0);
-    }
-}
-
-template <class S>
-void
-test(S s, typename S::size_type pos, S expected)
-{
-    typename S::size_type old_size = s.size();
-    S s0 = s;
-    try
-    {
-        s.erase(pos);
-        assert(s.__invariants());
-        assert(pos <= old_size);
-        assert(s == expected);
-    }
-    catch (std::out_of_range&)
-    {
-        assert(pos > old_size);
-        assert(s == s0);
-    }
-}
-
-template <class S>
-void
-test(S s, S expected)
-{
-    s.erase();
-    assert(s.__invariants());
-    assert(s == expected);
-}
-
-int main()
-{
-    {
-    typedef std::string S;
-    test(S(""), 0, 0, S(""));
-    test(S(""), 0, 1, S(""));
-    test(S(""), 1, 0, S("can't happen"));
-    test(S("abcde"), 0, 0, S("abcde"));
-    test(S("abcde"), 0, 1, S("bcde"));
-    test(S("abcde"), 0, 2, S("cde"));
-    test(S("abcde"), 0, 4, S("e"));
-    test(S("abcde"), 0, 5, S(""));
-    test(S("abcde"), 0, 6, S(""));
-    test(S("abcde"), 1, 0, S("abcde"));
-    test(S("abcde"), 1, 1, S("acde"));
-    test(S("abcde"), 1, 2, S("ade"));
-    test(S("abcde"), 1, 3, S("ae"));
-    test(S("abcde"), 1, 4, S("a"));
-    test(S("abcde"), 1, 5, S("a"));
-    test(S("abcde"), 2, 0, S("abcde"));
-    test(S("abcde"), 2, 1, S("abde"));
-    test(S("abcde"), 2, 2, S("abe"));
-    test(S("abcde"), 2, 3, S("ab"));
-    test(S("abcde"), 2, 4, S("ab"));
-    test(S("abcde"), 4, 0, S("abcde"));
-    test(S("abcde"), 4, 1, S("abcd"));
-    test(S("abcde"), 4, 2, S("abcd"));
-    test(S("abcde"), 5, 0, S("abcde"));
-    test(S("abcde"), 5, 1, S("abcde"));
-    test(S("abcde"), 6, 0, S("can't happen"));
-    test(S("abcdefghij"), 0, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 0, 1, S("bcdefghij"));
-    test(S("abcdefghij"), 0, 5, S("fghij"));
-    test(S("abcdefghij"), 0, 9, S("j"));
-    test(S("abcdefghij"), 0, 10, S(""));
-    test(S("abcdefghij"), 0, 11, S(""));
-    test(S("abcdefghij"), 1, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 1, 1, S("acdefghij"));
-    test(S("abcdefghij"), 1, 4, S("afghij"));
-    test(S("abcdefghij"), 1, 8, S("aj"));
-    test(S("abcdefghij"), 1, 9, S("a"));
-    test(S("abcdefghij"), 1, 10, S("a"));
-    test(S("abcdefghij"), 5, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 5, 1, S("abcdeghij"));
-    test(S("abcdefghij"), 5, 2, S("abcdehij"));
-    test(S("abcdefghij"), 5, 4, S("abcdej"));
-    test(S("abcdefghij"), 5, 5, S("abcde"));
-    test(S("abcdefghij"), 5, 6, S("abcde"));
-    test(S("abcdefghij"), 9, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 9, 1, S("abcdefghi"));
-    test(S("abcdefghij"), 9, 2, S("abcdefghi"));
-    test(S("abcdefghij"), 10, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 10, 1, S("abcdefghij"));
-    test(S("abcdefghij"), 11, 0, S("can't happen"));
-    test(S("abcdefghijklmnopqrst"), 0, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 0, 1, S("bcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 0, 10, S("klmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 0, 19, S("t"));
-    test(S("abcdefghijklmnopqrst"), 0, 20, S(""));
-    test(S("abcdefghijklmnopqrst"), 0, 21, S(""));
-    test(S("abcdefghijklmnopqrst"), 1, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, 1, S("acdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, 9, S("aklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, 18, S("at"));
-    test(S("abcdefghijklmnopqrst"), 1, 19, S("a"));
-    test(S("abcdefghijklmnopqrst"), 1, 20, S("a"));
-    test(S("abcdefghijklmnopqrst"), 10, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, 1, S("abcdefghijlmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, 5, S("abcdefghijpqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, 9, S("abcdefghijt"));
-    test(S("abcdefghijklmnopqrst"), 10, 10, S("abcdefghij"));
-    test(S("abcdefghijklmnopqrst"), 10, 11, S("abcdefghij"));
-    test(S("abcdefghijklmnopqrst"), 19, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 19, 1, S("abcdefghijklmnopqrs"));
-    test(S("abcdefghijklmnopqrst"), 19, 2, S("abcdefghijklmnopqrs"));
-    test(S("abcdefghijklmnopqrst"), 20, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 20, 1, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 21, 0, S("can't happen"));
-
-    test(S(""), 0, S(""));
-    test(S(""), 1, S("can't happen"));
-    test(S("abcde"), 0, S(""));
-    test(S("abcde"), 1, S("a"));
-    test(S("abcde"), 2, S("ab"));
-    test(S("abcde"), 4, S("abcd"));
-    test(S("abcde"), 5, S("abcde"));
-    test(S("abcde"), 6, S("can't happen"));
-    test(S("abcdefghij"), 0, S(""));
-    test(S("abcdefghij"), 1, S("a"));
-    test(S("abcdefghij"), 5, S("abcde"));
-    test(S("abcdefghij"), 9, S("abcdefghi"));
-    test(S("abcdefghij"), 10, S("abcdefghij"));
-    test(S("abcdefghij"), 11, S("can't happen"));
-    test(S("abcdefghijklmnopqrst"), 0, S(""));
-    test(S("abcdefghijklmnopqrst"), 1, S("a"));
-    test(S("abcdefghijklmnopqrst"), 10, S("abcdefghij"));
-    test(S("abcdefghijklmnopqrst"), 19, S("abcdefghijklmnopqrs"));
-    test(S("abcdefghijklmnopqrst"), 20, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 21, S("can't happen"));
-
-    test(S(""), S(""));
-    test(S("abcde"), S(""));
-    test(S("abcdefghij"), S(""));
-    test(S("abcdefghijklmnopqrst"), S(""));
-    }
-#if __cplusplus >= 201103L
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    test(S(""), 0, 0, S(""));
-    test(S(""), 0, 1, S(""));
-    test(S(""), 1, 0, S("can't happen"));
-    test(S("abcde"), 0, 0, S("abcde"));
-    test(S("abcde"), 0, 1, S("bcde"));
-    test(S("abcde"), 0, 2, S("cde"));
-    test(S("abcde"), 0, 4, S("e"));
-    test(S("abcde"), 0, 5, S(""));
-    test(S("abcde"), 0, 6, S(""));
-    test(S("abcde"), 1, 0, S("abcde"));
-    test(S("abcde"), 1, 1, S("acde"));
-    test(S("abcde"), 1, 2, S("ade"));
-    test(S("abcde"), 1, 3, S("ae"));
-    test(S("abcde"), 1, 4, S("a"));
-    test(S("abcde"), 1, 5, S("a"));
-    test(S("abcde"), 2, 0, S("abcde"));
-    test(S("abcde"), 2, 1, S("abde"));
-    test(S("abcde"), 2, 2, S("abe"));
-    test(S("abcde"), 2, 3, S("ab"));
-    test(S("abcde"), 2, 4, S("ab"));
-    test(S("abcde"), 4, 0, S("abcde"));
-    test(S("abcde"), 4, 1, S("abcd"));
-    test(S("abcde"), 4, 2, S("abcd"));
-    test(S("abcde"), 5, 0, S("abcde"));
-    test(S("abcde"), 5, 1, S("abcde"));
-    test(S("abcde"), 6, 0, S("can't happen"));
-    test(S("abcdefghij"), 0, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 0, 1, S("bcdefghij"));
-    test(S("abcdefghij"), 0, 5, S("fghij"));
-    test(S("abcdefghij"), 0, 9, S("j"));
-    test(S("abcdefghij"), 0, 10, S(""));
-    test(S("abcdefghij"), 0, 11, S(""));
-    test(S("abcdefghij"), 1, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 1, 1, S("acdefghij"));
-    test(S("abcdefghij"), 1, 4, S("afghij"));
-    test(S("abcdefghij"), 1, 8, S("aj"));
-    test(S("abcdefghij"), 1, 9, S("a"));
-    test(S("abcdefghij"), 1, 10, S("a"));
-    test(S("abcdefghij"), 5, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 5, 1, S("abcdeghij"));
-    test(S("abcdefghij"), 5, 2, S("abcdehij"));
-    test(S("abcdefghij"), 5, 4, S("abcdej"));
-    test(S("abcdefghij"), 5, 5, S("abcde"));
-    test(S("abcdefghij"), 5, 6, S("abcde"));
-    test(S("abcdefghij"), 9, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 9, 1, S("abcdefghi"));
-    test(S("abcdefghij"), 9, 2, S("abcdefghi"));
-    test(S("abcdefghij"), 10, 0, S("abcdefghij"));
-    test(S("abcdefghij"), 10, 1, S("abcdefghij"));
-    test(S("abcdefghij"), 11, 0, S("can't happen"));
-    test(S("abcdefghijklmnopqrst"), 0, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 0, 1, S("bcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 0, 10, S("klmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 0, 19, S("t"));
-    test(S("abcdefghijklmnopqrst"), 0, 20, S(""));
-    test(S("abcdefghijklmnopqrst"), 0, 21, S(""));
-    test(S("abcdefghijklmnopqrst"), 1, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, 1, S("acdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, 9, S("aklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 1, 18, S("at"));
-    test(S("abcdefghijklmnopqrst"), 1, 19, S("a"));
-    test(S("abcdefghijklmnopqrst"), 1, 20, S("a"));
-    test(S("abcdefghijklmnopqrst"), 10, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, 1, S("abcdefghijlmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, 5, S("abcdefghijpqrst"));
-    test(S("abcdefghijklmnopqrst"), 10, 9, S("abcdefghijt"));
-    test(S("abcdefghijklmnopqrst"), 10, 10, S("abcdefghij"));
-    test(S("abcdefghijklmnopqrst"), 10, 11, S("abcdefghij"));
-    test(S("abcdefghijklmnopqrst"), 19, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 19, 1, S("abcdefghijklmnopqrs"));
-    test(S("abcdefghijklmnopqrst"), 19, 2, S("abcdefghijklmnopqrs"));
-    test(S("abcdefghijklmnopqrst"), 20, 0, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 20, 1, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 21, 0, S("can't happen"));
-
-    test(S(""), 0, S(""));
-    test(S(""), 1, S("can't happen"));
-    test(S("abcde"), 0, S(""));
-    test(S("abcde"), 1, S("a"));
-    test(S("abcde"), 2, S("ab"));
-    test(S("abcde"), 4, S("abcd"));
-    test(S("abcde"), 5, S("abcde"));
-    test(S("abcde"), 6, S("can't happen"));
-    test(S("abcdefghij"), 0, S(""));
-    test(S("abcdefghij"), 1, S("a"));
-    test(S("abcdefghij"), 5, S("abcde"));
-    test(S("abcdefghij"), 9, S("abcdefghi"));
-    test(S("abcdefghij"), 10, S("abcdefghij"));
-    test(S("abcdefghij"), 11, S("can't happen"));
-    test(S("abcdefghijklmnopqrst"), 0, S(""));
-    test(S("abcdefghijklmnopqrst"), 1, S("a"));
-    test(S("abcdefghijklmnopqrst"), 10, S("abcdefghij"));
-    test(S("abcdefghijklmnopqrst"), 19, S("abcdefghijklmnopqrs"));
-    test(S("abcdefghijklmnopqrst"), 20, S("abcdefghijklmnopqrst"));
-    test(S("abcdefghijklmnopqrst"), 21, S("can't happen"));
-
-    test(S(""), S(""));
-    test(S("abcde"), S(""));
-    test(S("abcdefghij"), S(""));
-    test(S("abcdefghijklmnopqrst"), S(""));
-    }
-#endif
-}