summaryrefslogtreecommitdiffstats
path: root/libcxx/test/strings/basic.string/string.modifiers
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/strings/basic.string/string.modifiers')
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp2
52 files changed, 52 insertions, 52 deletions
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
index 0a1a412921d..fb28e498c32 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
int main()
{
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
index 1e5307b2dca..3bf2afa2552 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
@@ -16,7 +16,7 @@
#include <cassert>
#include "../../input_iterator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S, class It>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
index ab813612058..5ae15f0a0a4 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
@@ -15,7 +15,7 @@
#include <stdexcept>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
index 64f7bb6f6f0..5a9e8e2b814 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
@@ -16,7 +16,7 @@
#include <stdexcept>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
index 7a6a276fe7a..b0a2eb5e5cb 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
index 920a0bc7ea2..00e6ae375cc 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
@@ -15,7 +15,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
index 2568af4ef06..31f174b4f30 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
@@ -15,7 +15,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
index 9f4081f4f89..ac74f202654 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
@@ -16,7 +16,7 @@
#include <stdexcept>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
index b2c083415da..2dae1074596 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
int main()
{
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
index 3eefb7b8cac..83b5dd14b3f 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
@@ -16,7 +16,7 @@
#include <cassert>
#include "../../input_iterator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S, class It>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp
index f9d0614126e..adf24ac4987 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp
@@ -15,7 +15,7 @@
#include <stdexcept>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
index 5a8f9ce09fc..476fe963de7 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
@@ -16,7 +16,7 @@
#include <stdexcept>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
index 8c8dc6225c5..ac0e535eea2 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
@@ -15,7 +15,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
index 486161256fb..a8f747091c6 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
@@ -15,7 +15,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
index f58a8a49a13..d7ddb77b8e0 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
@@ -15,7 +15,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
index 5430be3227a..116673cc4dd 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
@@ -16,7 +16,7 @@
#include <stdexcept>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp
index f1e5a4ba22b..33801352816 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
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
index c9033dabdeb..6c2929d7f1d 100644
--- 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
@@ -20,7 +20,7 @@
#include <cstdlib>
#include <exception>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
int main()
{
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
index be95fe2d415..d20fcd4623b 100644
--- 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
@@ -20,7 +20,7 @@
#include <cstdlib>
#include <exception>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
int main()
{
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
index 1479171acdd..5015241ad63 100644
--- 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
@@ -20,7 +20,7 @@
#include <exception>
#include <cstdlib>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
int main()
{
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
index 13f97b45b66..6a23bf88ca5 100644
--- 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
@@ -20,7 +20,7 @@
#include <exception>
#include <cstdlib>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
int main()
{
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
index be3ee641b9f..a8443818aea 100644
--- 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
@@ -20,7 +20,7 @@
#include <exception>
#include <cstdlib>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
int main()
{
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
index c008196dcf0..0549e816b44 100644
--- 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
@@ -20,7 +20,7 @@
#include <exception>
#include <cstdlib>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
int main()
{
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
index 60d54965332..c44db71ae3b 100644
--- 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
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
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
index b9bc6ca184b..dbe6d7ba0e7 100644
--- 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
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
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
index e84a3ba12ec..790ce40b0a0 100644
--- 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
@@ -18,7 +18,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
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
index a1c37a90542..bc9ec1cf825 100644
--- 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
@@ -16,7 +16,7 @@
#include <stdexcept>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
index 9eff67e7f01..b9e5fa8bc06 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
@@ -19,7 +19,7 @@
#include <stdexcept>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
index 8fc469e3133..e091662eae0 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
@@ -18,7 +18,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
int main()
{
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
index 593279cdbf5..38353dd2f4e 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
@@ -20,7 +20,7 @@
#include <cassert>
#include "../../input_iterator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S, class It>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
index e104072c73b..739c89404c1 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
@@ -18,7 +18,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
index 25016ae4719..734dd8dffb7 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
@@ -16,7 +16,7 @@
#include <stdexcept>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
index 7f360993da1..29b00ec55b9 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
@@ -16,7 +16,7 @@
#include <stdexcept>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
index 5fad9b703d7..fd85696704c 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
@@ -16,7 +16,7 @@
#include <stdexcept>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
index 37ac686fa07..8c18941cf46 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
@@ -16,7 +16,7 @@
#include <stdexcept>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
index b1c4f4bc29c..b7317a32b41 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
@@ -17,7 +17,7 @@
#include <stdexcept>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp
index bea51ea3797..7384ae7f1d3 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp
index 04d588322d6..c291028998d 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
int main()
{
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp
index 9bdd2aa2a76..77b20d1bc08 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp
index 8d5a949f337..33649792521 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp
@@ -15,7 +15,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
index 6bc7148be4b..20455b258c0 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
int main()
{
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
index bdc4519305b..9295c5bde9f 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
@@ -17,7 +17,7 @@
#include <iterator>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S, class It>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
index 6d552f0e747..cb4ce61d094 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
index a8968ef7a3a..b1d6ab1ba57 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
index b1b3d96ff94..b0e2234a7e5 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
index 95ef8be2de3..0f95492fdb1 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
index 4dd1a828af7..914081bbc45 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
@@ -19,7 +19,7 @@
#include <algorithm>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
index 0b4aeafdab1..d9870428732 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
@@ -19,7 +19,7 @@
#include <algorithm>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
index f8e13b83b58..33f57fd3b86 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
index 08e906884df..c130780dc9d 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
index 099980015ee..25e5c4433cc 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp
index adc65cc5ab3..4973bda4ddf 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../../min_allocator.h"
+#include "min_allocator.h"
template <class S>
void
OpenPOWER on IntegriCloud