Found six (nmostly) identical files named 'test_allocator.h' in the libcxx test suite. Moved one to /support, made it a superset, and removed all but one of the others, and iupdated all the includes. Left the odd one (thread/futures/test_allocator.h) for later.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@196174 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/containers/sequences/deque/deque.cons/alloc.pass.cpp b/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
index 1bb672c..841bfd9 100644
--- a/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../NotConstructible.h"
 #include "min_allocator.h"
 
diff --git a/test/containers/sequences/deque/deque.cons/copy.pass.cpp b/test/containers/sequences/deque/deque.cons/copy.pass.cpp
index 8f79e12..fa0c120 100644
--- a/test/containers/sequences/deque/deque.cons/copy.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/copy.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <deque>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp b/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
index 9cf660c..efea494 100644
--- a/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp b/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
index fef1bb0..3605a1b 100644
--- a/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp b/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
index 15e082e..0f459b2 100644
--- a/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp b/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
index a2529b4..36c5af6 100644
--- a/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp b/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
index 89d9b34..b8c3e88 100644
--- a/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class InputIterator, class Allocator>
diff --git a/test/containers/sequences/deque/deque.cons/move.pass.cpp b/test/containers/sequences/deque/deque.cons/move.pass.cpp
index e2fb7e6..a20ad4c 100644
--- a/test/containers/sequences/deque/deque.cons/move.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/move.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp b/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
index f801ceb..0ba4a2d 100644
--- a/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp b/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
index eaab0f7..bb01dc5 100644
--- a/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp b/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
index 87b0f0e..c2bb40a 100644
--- a/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp b/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
index 4375a27..36f7807 100644
--- a/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp b/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
index 4cbb0fb..3a6ec83 100644
--- a/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <deque>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/test/containers/sequences/deque/deque.special/swap.pass.cpp b/test/containers/sequences/deque/deque.special/swap.pass.cpp
index 035bcea..808144c 100644
--- a/test/containers/sequences/deque/deque.special/swap.pass.cpp
+++ b/test/containers/sequences/deque/deque.special/swap.pass.cpp
@@ -14,7 +14,7 @@
 
 #include <deque>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp b/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
index c41e88b..d55d719 100644
--- a/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
+++ b/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/deque/types.pass.cpp b/test/containers/sequences/deque/types.pass.cpp
index 71cb540..d32b65c 100644
--- a/test/containers/sequences/deque/types.pass.cpp
+++ b/test/containers/sequences/deque/types.pass.cpp
@@ -33,7 +33,7 @@
 #include <iterator>
 #include <type_traits>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../Copyable.h"
 #include "min_allocator.h"
 
diff --git a/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp b/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp
index d9cedc4..d274bc0 100644
--- a/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp
+++ b/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp
@@ -31,7 +31,7 @@
 #include <algorithm>
 #include <complex>
 #include <string>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 using std::experimental::dynarray;
 
diff --git a/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp b/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp
index f0cd784..9b8240d 100644
--- a/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp
+++ b/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp
@@ -18,7 +18,7 @@
 #if _LIBCPP_STD_VER > 11
 
 #include <experimental/dynarray>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 using std::experimental::dynarray;
 
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp
index 044197a..cd4d1ed 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../NotConstructible.h"
 
 int main()
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
index 07a8e22..7aba906 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../NotConstructible.h"
 #include "min_allocator.h"
 
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
index 0de0d99..0b9263d 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
index ee41301..a3d270f 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../MoveOnly.h"
 #include "min_allocator.h"
 
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
index 0759418..2fc53bc 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
index 9ff8215..bcc24e1 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
index 2236048..6b0233d 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
index 9f12ced..1f7b05e 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
index e6e2f12..750486b 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
index 41de1eb..164801a 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../MoveOnly.h"
 #include "min_allocator.h"
 
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
index c43b3c1..ba0cb5d 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../MoveOnly.h"
 #include "min_allocator.h"
 
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
index b19e6dc..cc5b9d5 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
index d3a3d52..3666c7d 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
index d0810f9..d72c358 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "test_iterators.h"
 #include "min_allocator.h"
 
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
index 6d92c68..1d631ab 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
index 9c3a546..2b2be7b 100644
--- a/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
index aa34ce9..d6ba5a4 100644
--- a/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
@@ -15,7 +15,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
index 777a666..cde97d5 100644
--- a/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/list/list.cons/assign_copy.pass.cpp b/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
index 6426e01..b851eb9 100644
--- a/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
+++ b/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <list>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/list/list.cons/assign_move.pass.cpp b/test/containers/sequences/list/list.cons/assign_move.pass.cpp
index 3bcd824..99f0a98 100644
--- a/test/containers/sequences/list/list.cons/assign_move.pass.cpp
+++ b/test/containers/sequences/list/list.cons/assign_move.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/list/list.cons/copy.pass.cpp b/test/containers/sequences/list/list.cons/copy.pass.cpp
index 41e72f7..530690a 100644
--- a/test/containers/sequences/list/list.cons/copy.pass.cpp
+++ b/test/containers/sequences/list/list.cons/copy.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "DefaultOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp b/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
index f11e870..99fe9f1 100644
--- a/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
+++ b/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "DefaultOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp b/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp
index 3967fd6..f821fb4 100644
--- a/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp
+++ b/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp b/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
index 7ba1f46..13c7e5b 100644
--- a/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
+++ b/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp b/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
index 9720a3d..4a85e37 100644
--- a/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
+++ b/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/list/list.cons/move.pass.cpp b/test/containers/sequences/list/list.cons/move.pass.cpp
index ced38b4..44782b9 100644
--- a/test/containers/sequences/list/list.cons/move.pass.cpp
+++ b/test/containers/sequences/list/list.cons/move.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/list/list.cons/move_alloc.pass.cpp b/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
index 78e1445..4730755 100644
--- a/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
+++ b/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp b/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
index 63e1b7a..d502e1c 100644
--- a/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
+++ b/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp b/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp
index f49c565..2c10443 100644
--- a/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp
+++ b/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/list/list.special/swap.pass.cpp b/test/containers/sequences/list/list.special/swap.pass.cpp
index 9f790cd..bc5f485 100644
--- a/test/containers/sequences/list/list.special/swap.pass.cpp
+++ b/test/containers/sequences/list/list.special/swap.pass.cpp
@@ -14,7 +14,7 @@
 
 #include <list>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp b/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp
index f2d6cc1..7a23398 100644
--- a/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp
+++ b/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/vector.bool/assign_copy.pass.cpp b/test/containers/sequences/vector.bool/assign_copy.pass.cpp
index e524e1a..9501799 100644
--- a/test/containers/sequences/vector.bool/assign_copy.pass.cpp
+++ b/test/containers/sequences/vector.bool/assign_copy.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/vector.bool/assign_move.pass.cpp b/test/containers/sequences/vector.bool/assign_move.pass.cpp
index b3bb0f1..df98c81 100644
--- a/test/containers/sequences/vector.bool/assign_move.pass.cpp
+++ b/test/containers/sequences/vector.bool/assign_move.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/vector.bool/construct_default.pass.cpp b/test/containers/sequences/vector.bool/construct_default.pass.cpp
index f7ec5db..51ecbb1 100644
--- a/test/containers/sequences/vector.bool/construct_default.pass.cpp
+++ b/test/containers/sequences/vector.bool/construct_default.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/test/containers/sequences/vector.bool/construct_size.pass.cpp b/test/containers/sequences/vector.bool/construct_size.pass.cpp
index 65f2ed5..93ecbe8 100644
--- a/test/containers/sequences/vector.bool/construct_size.pass.cpp
+++ b/test/containers/sequences/vector.bool/construct_size.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 
 #include "min_allocator.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class C>
 void
diff --git a/test/containers/sequences/vector.bool/copy.pass.cpp b/test/containers/sequences/vector.bool/copy.pass.cpp
index b9ce87c..5882278 100644
--- a/test/containers/sequences/vector.bool/copy.pass.cpp
+++ b/test/containers/sequences/vector.bool/copy.pass.cpp
@@ -14,7 +14,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/test/containers/sequences/vector.bool/copy_alloc.pass.cpp b/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
index 2b5cae6..2f0192b 100644
--- a/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
+++ b/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/test/containers/sequences/vector.bool/default_noexcept.pass.cpp b/test/containers/sequences/vector.bool/default_noexcept.pass.cpp
index 2f77206..b94588e 100644
--- a/test/containers/sequences/vector.bool/default_noexcept.pass.cpp
+++ b/test/containers/sequences/vector.bool/default_noexcept.pass.cpp
@@ -17,7 +17,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp b/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
index 9c0b4e4..682e74e 100644
--- a/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
+++ b/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp b/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
index c86b644..aea3ad7 100644
--- a/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
+++ b/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/vector.bool/move.pass.cpp b/test/containers/sequences/vector.bool/move.pass.cpp
index 1b3fe49..e877292 100644
--- a/test/containers/sequences/vector.bool/move.pass.cpp
+++ b/test/containers/sequences/vector.bool/move.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/vector.bool/move_alloc.pass.cpp b/test/containers/sequences/vector.bool/move_alloc.pass.cpp
index 7b157fb..deee932 100644
--- a/test/containers/sequences/vector.bool/move_alloc.pass.cpp
+++ b/test/containers/sequences/vector.bool/move_alloc.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp b/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
index 8aaa770..b580eb4 100644
--- a/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
+++ b/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/vector.bool/move_noexcept.pass.cpp b/test/containers/sequences/vector.bool/move_noexcept.pass.cpp
index 364c302..ab32bd0 100644
--- a/test/containers/sequences/vector.bool/move_noexcept.pass.cpp
+++ b/test/containers/sequences/vector.bool/move_noexcept.pass.cpp
@@ -17,7 +17,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/vector.bool/swap.pass.cpp b/test/containers/sequences/vector.bool/swap.pass.cpp
index f30e347..a92c6a6 100644
--- a/test/containers/sequences/vector.bool/swap.pass.cpp
+++ b/test/containers/sequences/vector.bool/swap.pass.cpp
@@ -14,7 +14,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp b/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp
index 99fa51f..bcaf161 100644
--- a/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp
+++ b/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/vector.bool/types.pass.cpp b/test/containers/sequences/vector.bool/types.pass.cpp
index 8cc9cb9..b266b3b 100644
--- a/test/containers/sequences/vector.bool/types.pass.cpp
+++ b/test/containers/sequences/vector.bool/types.pass.cpp
@@ -31,7 +31,7 @@
 #include <iterator>
 #include <type_traits>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../Copyable.h"
 #include "min_allocator.h"
 
diff --git a/test/containers/sequences/vector/types.pass.cpp b/test/containers/sequences/vector/types.pass.cpp
index c064587..3504de6 100644
--- a/test/containers/sequences/vector/types.pass.cpp
+++ b/test/containers/sequences/vector/types.pass.cpp
@@ -33,7 +33,7 @@
 #include <iterator>
 #include <type_traits>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../Copyable.h"
 #include "min_allocator.h"
 
diff --git a/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp b/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
index 1ad4bfc..6f02c3b 100644
--- a/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp b/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
index 3355254..1365038 100644
--- a/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp b/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
index 7321f93..f8b66f4 100644
--- a/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../NotConstructible.h"
 #include "../../../stack_allocator.h"
 #include "min_allocator.h"
diff --git a/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp b/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
index 0cff78d..c6bbf6e 100644
--- a/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
@@ -16,7 +16,7 @@
 
 #include "DefaultOnly.h"
 #include "min_allocator.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class C>
 void
diff --git a/test/containers/sequences/vector/vector.cons/copy.pass.cpp b/test/containers/sequences/vector/vector.cons/copy.pass.cpp
index 78e7fac..6962f70 100644
--- a/test/containers/sequences/vector/vector.cons/copy.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/copy.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp b/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
index b0e07db..7ff2a1e 100644
--- a/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp b/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
index 5c378c5..3fc33b6 100644
--- a/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp b/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
index 843c067..0d73e9e 100644
--- a/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp b/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
index d449f2a..b57d2ed 100644
--- a/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/vector/vector.cons/move.pass.cpp b/test/containers/sequences/vector/vector.cons/move.pass.cpp
index 6b9be7b..f09e346 100644
--- a/test/containers/sequences/vector/vector.cons/move.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/move.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp b/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
index 2640593..0aac64d 100644
--- a/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp b/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
index 30ff5be..158370f 100644
--- a/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp b/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
index 57e0322..a2e36cc 100644
--- a/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/test/containers/sequences/vector/vector.special/swap.pass.cpp b/test/containers/sequences/vector/vector.special/swap.pass.cpp
index 9fa1274..a7d0c40 100644
--- a/test/containers/sequences/vector/vector.special/swap.pass.cpp
+++ b/test/containers/sequences/vector/vector.special/swap.pass.cpp
@@ -14,7 +14,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp b/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp
index 714bd45..996712a 100644
--- a/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp
+++ b/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc