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/associative/map/map.cons/alloc.pass.cpp b/test/containers/associative/map/map.cons/alloc.pass.cpp
index 9214673..2292c47 100644
--- a/test/containers/associative/map/map.cons/alloc.pass.cpp
+++ b/test/containers/associative/map/map.cons/alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <map>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/map/map.cons/compare_alloc.pass.cpp b/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
index dcb0856..56b3c33 100644
--- a/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
+++ b/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/map/map.cons/copy.pass.cpp b/test/containers/associative/map/map.cons/copy.pass.cpp
index 15d1a4e..be52741 100644
--- a/test/containers/associative/map/map.cons/copy.pass.cpp
+++ b/test/containers/associative/map/map.cons/copy.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/map/map.cons/copy_alloc.pass.cpp b/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
index 1512e2d..fcbe597 100644
--- a/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
+++ b/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/map/map.cons/copy_assign.pass.cpp b/test/containers/associative/map/map.cons/copy_assign.pass.cpp
index 8bd45a3..ac05e29 100644
--- a/test/containers/associative/map/map.cons/copy_assign.pass.cpp
+++ b/test/containers/associative/map/map.cons/copy_assign.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/map/map.cons/default_noexcept.pass.cpp b/test/containers/associative/map/map.cons/default_noexcept.pass.cpp
index d673c6d..6c6b614 100644
--- a/test/containers/associative/map/map.cons/default_noexcept.pass.cpp
+++ b/test/containers/associative/map/map.cons/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
diff --git a/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp b/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
index a563371..c60f2e7 100644
--- a/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
+++ b/test/containers/associative/map/map.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/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp b/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
index 93930fc..765428a 100644
--- a/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
+++ b/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <map>
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp b/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
index 81fa3c8..67fb5d6 100644
--- a/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
+++ b/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/map/map.cons/move.pass.cpp b/test/containers/associative/map/map.cons/move.pass.cpp
index 0a0ca44..c06f2ee 100644
--- a/test/containers/associative/map/map.cons/move.pass.cpp
+++ b/test/containers/associative/map/map.cons/move.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/map/map.cons/move_alloc.pass.cpp b/test/containers/associative/map/map.cons/move_alloc.pass.cpp
index d377ad8..1845e88 100644
--- a/test/containers/associative/map/map.cons/move_alloc.pass.cpp
+++ b/test/containers/associative/map/map.cons/move_alloc.pass.cpp
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/map/map.cons/move_assign.pass.cpp b/test/containers/associative/map/map.cons/move_assign.pass.cpp
index 8b0eca7..6d285fc 100644
--- a/test/containers/associative/map/map.cons/move_assign.pass.cpp
+++ b/test/containers/associative/map/map.cons/move_assign.pass.cpp
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp b/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
index 3bc1e68..d12f9a9 100644
--- a/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
+++ b/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
diff --git a/test/containers/associative/map/map.cons/move_noexcept.pass.cpp b/test/containers/associative/map/map.cons/move_noexcept.pass.cpp
index e9ec120..6de4b67 100644
--- a/test/containers/associative/map/map.cons/move_noexcept.pass.cpp
+++ b/test/containers/associative/map/map.cons/move_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_comp
diff --git a/test/containers/associative/map/map.special/non_member_swap.pass.cpp b/test/containers/associative/map/map.special/non_member_swap.pass.cpp
index dc925fd..57588e6 100644
--- a/test/containers/associative/map/map.special/non_member_swap.pass.cpp
+++ b/test/containers/associative/map/map.special/non_member_swap.pass.cpp
@@ -17,7 +17,7 @@
#include <map>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_compare.h"
#include "min_allocator.h"
diff --git a/test/containers/associative/map/map.special/swap_noexcept.pass.cpp b/test/containers/associative/map/map.special/swap_noexcept.pass.cpp
index ef2ef04..b8b7863 100644
--- a/test/containers/associative/map/map.special/swap_noexcept.pass.cpp
+++ b/test/containers/associative/map/map.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_comp
diff --git a/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
index 5b494c9..87bf044 100644
--- a/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <map>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
index c578b20..1224884 100644
--- a/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/multimap/multimap.cons/copy.pass.cpp b/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
index 7edcc51..3d6626e 100644
--- a/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
index c5b87aa..22594e3 100644
--- a/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp b/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
index c7a0e49..f00f0fe 100644
--- a/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp b/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
index a144ba9..315efd1 100644
--- a/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
diff --git a/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp b/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
index 14e3f64..50d8f42 100644
--- a/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
+++ b/test/containers/associative/multimap/multimap.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/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
index c65c36b..0e73f72 100644
--- a/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <map>
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
index dfd946e..259fbd1 100644
--- a/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/multimap/multimap.cons/move.pass.cpp b/test/containers/associative/multimap/multimap.cons/move.pass.cpp
index 06bab09..aed0886 100644
--- a/test/containers/associative/multimap/multimap.cons/move.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/move.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
index 7f5f0f7..651993a 100644
--- a/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp b/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
index e02a988..496e535 100644
--- a/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp b/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
index ddb4e48..b248818 100644
--- a/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
diff --git a/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp b/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
index 6ea0699..84316a1 100644
--- a/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/move_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_comp
diff --git a/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp b/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
index d403774..effec2b 100644
--- a/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
+++ b/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
@@ -17,7 +17,7 @@
#include <map>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_compare.h"
#include "min_allocator.h"
diff --git a/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp b/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
index b07d56a..687c443 100644
--- a/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
+++ b/test/containers/associative/multimap/multimap.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_comp
diff --git a/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp
index 0a5176a..0a75722 100644
--- a/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <set>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp
index 41bf248..76c9f8b 100644
--- a/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/multiset/multiset.cons/copy.pass.cpp b/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
index c6b2822..dde3628 100644
--- a/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp
index 3bde9d6..04a769e 100644
--- a/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp b/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
index 8636420..19bdd71 100644
--- a/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp b/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
index 2e3e56e..a0bdb07 100644
--- a/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
diff --git a/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp b/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
index f04ae94..658af1a 100644
--- a/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
+++ b/test/containers/associative/multiset/multiset.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/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
index d0eebad..8311489 100644
--- a/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <set>
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
index b6d25d6..4ed00c7 100644
--- a/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
@@ -20,7 +20,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/multiset/multiset.cons/move.pass.cpp b/test/containers/associative/multiset/multiset.cons/move.pass.cpp
index a5195f7..40321cd 100644
--- a/test/containers/associative/multiset/multiset.cons/move.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/move.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
index d518fb2..1a0b065 100644
--- a/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp b/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
index 2af24ce..0b0ce44 100644
--- a/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp b/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
index e5ce349..cef3f20 100644
--- a/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
diff --git a/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp b/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
index 8f2b496..e18f3f5 100644
--- a/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/move_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_comp
diff --git a/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp b/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
index 0b4a7a7..222985a 100644
--- a/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
+++ b/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
@@ -15,7 +15,7 @@
#include <set>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_compare.h"
int main()
diff --git a/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp b/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
index dd28787..531fe80 100644
--- a/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
+++ b/test/containers/associative/multiset/multiset.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_comp
diff --git a/test/containers/associative/set/set.cons/alloc.pass.cpp b/test/containers/associative/set/set.cons/alloc.pass.cpp
index 4506eaf..67433ff 100644
--- a/test/containers/associative/set/set.cons/alloc.pass.cpp
+++ b/test/containers/associative/set/set.cons/alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <set>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/set/set.cons/compare_alloc.pass.cpp b/test/containers/associative/set/set.cons/compare_alloc.pass.cpp
index fb7b360..22b3328 100644
--- a/test/containers/associative/set/set.cons/compare_alloc.pass.cpp
+++ b/test/containers/associative/set/set.cons/compare_alloc.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/set/set.cons/copy.pass.cpp b/test/containers/associative/set/set.cons/copy.pass.cpp
index df54cd3..a0e34e4 100644
--- a/test/containers/associative/set/set.cons/copy.pass.cpp
+++ b/test/containers/associative/set/set.cons/copy.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/set/set.cons/copy_alloc.pass.cpp b/test/containers/associative/set/set.cons/copy_alloc.pass.cpp
index 9e244fe..1ad03dc 100644
--- a/test/containers/associative/set/set.cons/copy_alloc.pass.cpp
+++ b/test/containers/associative/set/set.cons/copy_alloc.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/set/set.cons/copy_assign.pass.cpp b/test/containers/associative/set/set.cons/copy_assign.pass.cpp
index 0bf6d1b..ae83eb3 100644
--- a/test/containers/associative/set/set.cons/copy_assign.pass.cpp
+++ b/test/containers/associative/set/set.cons/copy_assign.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/set/set.cons/default_noexcept.pass.cpp b/test/containers/associative/set/set.cons/default_noexcept.pass.cpp
index 6cf394e..4d5754a 100644
--- a/test/containers/associative/set/set.cons/default_noexcept.pass.cpp
+++ b/test/containers/associative/set/set.cons/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
diff --git a/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp b/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
index 66adff0..25f5425 100644
--- a/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
+++ b/test/containers/associative/set/set.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/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp b/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
index d4021ac..821820a 100644
--- a/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
+++ b/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
@@ -17,7 +17,7 @@
#include <set>
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp b/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
index 1ae4634..5ccb6e5 100644
--- a/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
+++ b/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
@@ -24,7 +24,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/set/set.cons/move.pass.cpp b/test/containers/associative/set/set.cons/move.pass.cpp
index 53d4bd6..4026ec7 100644
--- a/test/containers/associative/set/set.cons/move.pass.cpp
+++ b/test/containers/associative/set/set.cons/move.pass.cpp
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/set/set.cons/move_alloc.pass.cpp b/test/containers/associative/set/set.cons/move_alloc.pass.cpp
index f50ce00..c4617f0 100644
--- a/test/containers/associative/set/set.cons/move_alloc.pass.cpp
+++ b/test/containers/associative/set/set.cons/move_alloc.pass.cpp
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/associative/set/set.cons/move_assign.pass.cpp b/test/containers/associative/set/set.cons/move_assign.pass.cpp
index 48a799e..4e08f01 100644
--- a/test/containers/associative/set/set.cons/move_assign.pass.cpp
+++ b/test/containers/associative/set/set.cons/move_assign.pass.cpp
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp b/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
index 35683b1..17ea740 100644
--- a/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
+++ b/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
diff --git a/test/containers/associative/set/set.cons/move_noexcept.pass.cpp b/test/containers/associative/set/set.cons/move_noexcept.pass.cpp
index c3df4ca..7a8ae7b 100644
--- a/test/containers/associative/set/set.cons/move_noexcept.pass.cpp
+++ b/test/containers/associative/set/set.cons/move_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_comp
diff --git a/test/containers/associative/set/set.special/non_member_swap.pass.cpp b/test/containers/associative/set/set.special/non_member_swap.pass.cpp
index 6f7d0bf..c9cffc6 100644
--- a/test/containers/associative/set/set.special/non_member_swap.pass.cpp
+++ b/test/containers/associative/set/set.special/non_member_swap.pass.cpp
@@ -15,7 +15,7 @@
#include <set>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_compare.h"
int main()
diff --git a/test/containers/associative/set/set.special/swap_noexcept.pass.cpp b/test/containers/associative/set/set.special/swap_noexcept.pass.cpp
index 2ce1d8c..c4f169a 100644
--- a/test/containers/associative/set/set.special/swap_noexcept.pass.cpp
+++ b/test/containers/associative/set/set.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_comp
diff --git a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
index a0b17a1..b102f11 100644
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
+++ b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct test
diff --git a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
index 8a204d7..4d99fc1 100644
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
+++ b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct test
diff --git a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
index 95ee912..66ca614 100644
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
+++ b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
C
diff --git a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
index 26139fb..643b0c6 100644
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
+++ b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
C
diff --git a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
index 8499085..a5a073c 100644
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
+++ b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
@@ -25,7 +25,7 @@
return c;
}
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct test
diff --git a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
index e102fd4..d4df36c 100644
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
+++ b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
@@ -29,7 +29,7 @@
return c;
}
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct test
diff --git a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
index c8a2d12..b3ee758 100644
--- a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
+++ b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
struct test
: private std::queue<int, std::deque<int, test_allocator<int> > >
diff --git a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
index 4e07e3d..16ba174 100644
--- a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
+++ b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
C
diff --git a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
index 9ac82f7..70eaa18 100644
--- a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
+++ b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
C
diff --git a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
index a9bc833..b752238 100644
--- a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
+++ b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../MoveOnly.h"
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
diff --git a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
index 8e0efbb..11b4ecd 100644
--- a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
+++ b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../MoveOnly.h"
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
diff --git a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
index 1a98cb5..94899d4 100644
--- a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
+++ b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
@@ -15,7 +15,7 @@
#include <stack>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
struct test
: private std::stack<int, std::deque<int, test_allocator<int> > >
diff --git a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
index 2fd06ee..fe86227 100644
--- a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
+++ b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
@@ -15,7 +15,7 @@
#include <stack>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
C
diff --git a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
index 4a15c79..33cb4dd 100644
--- a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
+++ b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
@@ -15,7 +15,7 @@
#include <stack>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
C
diff --git a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
index 87a7963..16ba9d7 100644
--- a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
+++ b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
@@ -15,7 +15,7 @@
#include <stack>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../MoveOnly.h"
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
diff --git a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
index 98496d3..19d968a 100644
--- a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
+++ b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
@@ -15,7 +15,7 @@
#include <stack>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../MoveOnly.h"
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
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
diff --git a/test/containers/unord/unord.map/swap_member.pass.cpp b/test/containers/unord/unord.map/swap_member.pass.cpp
index d0e1620..6e6503e 100644
--- a/test/containers/unord/unord.map/swap_member.pass.cpp
+++ b/test/containers/unord/unord.map/swap_member.pass.cpp
@@ -21,7 +21,7 @@
#include "../../test_compare.h"
#include "../../test_hash.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
index 9267f1f..0fc76db 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
index 987d339..928377b 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
index a98c900..dd57c58 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
index 1aa67ef..227343e 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
index 800bc59..d1757d8 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
index 1adaba9..42f1faa 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
index ebf8e13..df8c7b5 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_hash.h"
template <class T>
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
index 5d2e4c4..1fc37f7 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/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/unord/unord.map/unord.map.cnstr/init.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
index 60895dd..dbc48f8 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
index e159105..ac09053 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
index 59b488f..7a4130b 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
index e2c0de7..036008c 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
@@ -23,7 +23,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
index e7ae08e..7c83192 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
@@ -23,7 +23,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
index 379ce22..18e6683 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
index ae2f2f7..091a72f 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
index 27174b3..f7fde37 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
index 3a97097..1c86dd3 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/move_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_comp
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
index 8026c01..c1784d6 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
@@ -25,7 +25,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
index 2f01ba0..f914b30 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
@@ -25,7 +25,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
index 0aaf1d4..7a0dbce 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
@@ -26,7 +26,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
index cc07ff2..61eef5b 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
@@ -26,7 +26,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
index b672587..99493fa 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -27,7 +27,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp b/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
index 7881f70..0a3ae3a 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
index 05d6937..708dc23 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
index 0d54d5e..6c975ec 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
index 83e0ffc..8b2bb31 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
index 0b77546..bcf7b91 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp b/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp
index 579b6d5..49ac757 100644
--- a/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.swap/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_comp
diff --git a/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp b/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp
index 44a6b8f..6993a7e 100644
--- a/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/swap_member.pass.cpp b/test/containers/unord/unord.multimap/swap_member.pass.cpp
index e68fcd5..12822a9 100644
--- a/test/containers/unord/unord.multimap/swap_member.pass.cpp
+++ b/test/containers/unord/unord.multimap/swap_member.pass.cpp
@@ -21,7 +21,7 @@
#include "../../test_compare.h"
#include "../../test_hash.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
index b8ceb36..dc41fad 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
index 20b4da3..4f47c78 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
index 4bac2a8..2d3c143 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
index f9aa416..0c43fa8 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
index e896673..d71838f 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
index fc3f31a..2a064c5 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
index 34b26f8..b7a01a4 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
index cc8bb72..9812a45 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_hash.h"
template <class T>
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
index f6c8551..ae2a96e 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/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/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
index 45a56d7..cc5532a 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
index 1c1b5f2..48239db 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
index 45b4400..ff00546 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
index 370bc53..095e9c3 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
@@ -23,7 +23,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
index a115d16..d2f698a 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
@@ -23,7 +23,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
index 5f24df2..fd70ff1 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
index 25f1193..d958e23 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
@@ -24,7 +24,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
index ee69b33..078693d 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
index 7eb5f32..44565d1 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_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_comp
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
index 5849ece..bb700ec 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
@@ -25,7 +25,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
index 58006fb..a3fd4d1 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
@@ -25,7 +25,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
index a54bc5b..4e7b1ac 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
@@ -26,7 +26,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
index ca48b5e..879e681 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
@@ -26,7 +26,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
index 3208c78..8e42ca7 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -27,7 +27,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
index 787e930..44cf84f 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
index cfc7b1a..bd56a41 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
index ea20b6b..3346061 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
index 5fb433a..c2420ce 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
index 1512f36..3388667 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp
index 227a700..a7700b4 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.swap/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_comp
diff --git a/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
index 286b574..a73d7fc 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/swap_member.pass.cpp b/test/containers/unord/unord.multiset/swap_member.pass.cpp
index 5c2ea23..275ff40 100644
--- a/test/containers/unord/unord.multiset/swap_member.pass.cpp
+++ b/test/containers/unord/unord.multiset/swap_member.pass.cpp
@@ -20,7 +20,7 @@
#include "../../test_compare.h"
#include "../../test_hash.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
index ca7169e..ccd21a5 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
index 6a2cd8e..f634994 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
index 7baf89a..4eaf2c5 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
index 94b78c7..4b0e52c 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
index d778861..9424183 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
index 37d8ed6..22e372b 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
index 220aa94..6726bc1 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
index 84bd140..0effeed 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_hash.h"
template <class T>
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
index 03b33ff..c4c54a5 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/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/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
index fbb39ea..416c28c 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
index e1331da..a6543a0 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
index 2894700..7d0f371 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
index 7644bd3..cd013f9 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
index ef79865..4621c7f 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
index 697ecf5..a68cfe8 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
index daa26f2..9eee69a 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
index 8d60153..8a56d1a 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
index 7ef3ca6..aa7ad05 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_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_comp
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
index 6f3caee..cd2bb1e 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
@@ -23,7 +23,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
index 9538cde..4f5e03e 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
@@ -23,7 +23,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
index 2b83cb0..6b83bde 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
@@ -24,7 +24,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
index cccd74b..89e7c7f 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
@@ -24,7 +24,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
index 3675a24..b712a96 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -25,7 +25,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
index 61cfc5e..e55db7c 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
index 6ffdbfd..35bfbe3 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
index c0ec5af..0171ea6 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
index 4d7b3f6..785cdf2 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
index 9d913e7..50dd3c9 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
index 95c84f4..40dac3c 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.swap/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_comp
diff --git a/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
index c2e068e..624b81c 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
@@ -20,7 +20,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/swap_member.pass.cpp b/test/containers/unord/unord.set/swap_member.pass.cpp
index 4497606..89ec986 100644
--- a/test/containers/unord/unord.set/swap_member.pass.cpp
+++ b/test/containers/unord/unord.set/swap_member.pass.cpp
@@ -20,7 +20,7 @@
#include "../../test_compare.h"
#include "../../test_hash.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
index 3e22134..30905ae 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
index e53656a..a1f8c48 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
index 55c8df6..69d19a4 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
index 50ce419..e8712b7 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
index dbed56c..ee05acd 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
index 4265e30..8e1ecd8 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
index 6eaa8c2..ee901fb 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
index 5063d51..b3cd9c3 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_hash.h"
template <class T>
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
index 3e468e9..68ef7f4 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/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/unord/unord.set/unord.set.cnstr/init.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
index 8e5938e..2c31d57 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
index 4872bab..36dab79 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
index 2905c04..81af2b4 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
index 04c7b8a..f35dd1a 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
index e8875ab..34ff62e 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
index 11191a1..6bda4af 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
index c977057..229e799 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
index 176e9c5..c3c94fd 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
index 67f16c3..791a67d 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/move_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_comp
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
index 24a6e35..40f3f4f 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
@@ -23,7 +23,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
index e4ed134..179f73d 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
@@ -23,7 +23,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
index b0e568a..60350de 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
@@ -24,7 +24,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
index 90c419b..70e82d0 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
@@ -24,7 +24,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
index 0f89258..a6fb2e6 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -25,7 +25,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp b/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp
index d5d5706..389c54c 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
index 450f2dd..8f6228a 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
index b2b7da7..4c2c18e 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
index 9a52988..e936878 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
index d20e03f..96233e1 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp b/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
index 508d567..359e296 100644
--- a/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.swap/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_comp
diff --git a/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp b/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
index f529ad6..7415e29 100644
--- a/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
@@ -20,7 +20,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/re/re.results/re.results.all/get_allocator.pass.cpp b/test/re/re.results/re.results.all/get_allocator.pass.cpp
index d604d27..0436795 100644
--- a/test/re/re.results/re.results.all/get_allocator.pass.cpp
+++ b/test/re/re.results/re.results.all/get_allocator.pass.cpp
@@ -16,7 +16,7 @@
#include <regex>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
template <class CharT, class Allocator>
void
diff --git a/test/re/re.results/re.results.const/allocator.pass.cpp b/test/re/re.results/re.results.const/allocator.pass.cpp
index 15c4915..a24c669 100644
--- a/test/re/re.results/re.results.const/allocator.pass.cpp
+++ b/test/re/re.results/re.results.const/allocator.pass.cpp
@@ -16,7 +16,7 @@
#include <regex>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
template <class CharT, class Allocator>
void
diff --git a/test/re/re.results/re.results.form/form2.pass.cpp b/test/re/re.results/re.results.form/form2.pass.cpp
index 9e82c1f..b18b7fb 100644
--- a/test/re/re.results/re.results.form/form2.pass.cpp
+++ b/test/re/re.results/re.results.form/form2.pass.cpp
@@ -22,7 +22,7 @@
#include <cassert>
#include "test_iterators.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/re/re.results/re.results.form/form3.pass.cpp b/test/re/re.results/re.results.form/form3.pass.cpp
index d8e3958..27f2388 100644
--- a/test/re/re.results/re.results.form/form3.pass.cpp
+++ b/test/re/re.results/re.results.form/form3.pass.cpp
@@ -21,7 +21,7 @@
#include <regex>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/re/test_allocator.h b/test/re/test_allocator.h
deleted file mode 100644
index eed33a0..0000000
--- a/test/re/test_allocator.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-
-class test_alloc_base
-{
-protected:
- static int count;
-public:
- static int throw_after;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
- : public test_alloc_base
-{
- int data_;
-
- template <class U> friend class test_allocator;
-public:
-
- typedef unsigned size_type;
- typedef int difference_type;
- typedef T value_type;
- typedef value_type* pointer;
- typedef const value_type* const_pointer;
- typedef typename std::add_lvalue_reference<value_type>::type reference;
- typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
- template <class U> struct rebind {typedef test_allocator<U> other;};
-
- test_allocator() throw() : data_(-1) {}
- explicit test_allocator(int i) throw() : data_(i) {}
- test_allocator(const test_allocator& a) throw()
- : data_(a.data_) {}
- template <class U> test_allocator(const test_allocator<U>& a) throw()
- : data_(a.data_) {}
- ~test_allocator() throw() {data_ = 0;}
- pointer address(reference x) const {return &x;}
- const_pointer address(const_reference x) const {return &x;}
- pointer allocate(size_type n, const void* = 0)
- {
- if (count >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
- throw std::bad_alloc();
-#else
- std::terminate();
-#endif
- }
- ++count;
- return (pointer)std::malloc(n * sizeof(T));
- }
- void deallocate(pointer p, size_type n)
- {std::free(p);}
- size_type max_size() const throw()
- {return UINT_MAX / sizeof(T);}
- void construct(pointer p, const T& val)
- {::new(p) T(val);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
- void construct(pointer p, T&& val)
- {::new(p) T(std::move(val));}
-#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
- void destroy(pointer p) {p->~T();}
-
- friend bool operator==(const test_allocator& x, const test_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const test_allocator& x, const test_allocator& y)
- {return !(x == y);}
-};
-
-template <class T>
-class other_allocator
-{
- int data_;
-
- template <class U> friend class other_allocator;
-
-public:
- typedef T value_type;
-
- other_allocator() : data_(-1) {}
- explicit other_allocator(int i) : data_(i) {}
- template <class U> other_allocator(const other_allocator<U>& a)
- : data_(a.data_) {}
- T* allocate(std::size_t n)
- {return (T*)std::malloc(n * sizeof(T));}
- void deallocate(T* p, std::size_t n)
- {std::free(p);}
-
- other_allocator select_on_container_copy_construction() const
- {return other_allocator(-2);}
-
- friend bool operator==(const other_allocator& x, const other_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const other_allocator& x, const other_allocator& y)
- {return !(x == y);}
-
- typedef std::true_type propagate_on_container_copy_assignment;
- typedef std::true_type propagate_on_container_move_assignment;
- typedef std::true_type propagate_on_container_swap;
-
-#ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE
- std::size_t max_size() const
- {return UINT_MAX / sizeof(T);}
-#endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-};
-
-#endif // TEST_ALLOCATOR_H
diff --git a/test/strings/basic.string/string.capacity/capacity.pass.cpp b/test/strings/basic.string/string.capacity/capacity.pass.cpp
index 4a447d5..bae7621 100644
--- a/test/strings/basic.string/string.capacity/capacity.pass.cpp
+++ b/test/strings/basic.string/string.capacity/capacity.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
diff --git a/test/strings/basic.string/string.cons/alloc.pass.cpp b/test/strings/basic.string/string.cons/alloc.pass.cpp
index b15b569..512d118 100644
--- a/test/strings/basic.string/string.cons/alloc.pass.cpp
+++ b/test/strings/basic.string/string.cons/alloc.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
diff --git a/test/strings/basic.string/string.cons/copy.pass.cpp b/test/strings/basic.string/string.cons/copy.pass.cpp
index fb6001f..9c9fc32 100644
--- a/test/strings/basic.string/string.cons/copy.pass.cpp
+++ b/test/strings/basic.string/string.cons/copy.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
diff --git a/test/strings/basic.string/string.cons/copy_alloc.pass.cpp b/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
index d18241e..cf80210 100644
--- a/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
+++ b/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
diff --git a/test/strings/basic.string/string.cons/default_noexcept.pass.cpp b/test/strings/basic.string/string.cons/default_noexcept.pass.cpp
index ed68c93..f935db8 100644
--- a/test/strings/basic.string/string.cons/default_noexcept.pass.cpp
+++ b/test/strings/basic.string/string.cons/default_noexcept.pass.cpp
@@ -17,7 +17,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
diff --git a/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp b/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
index c455083..b3cc127 100644
--- a/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
+++ b/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
diff --git a/test/strings/basic.string/string.cons/initializer_list.pass.cpp b/test/strings/basic.string/string.cons/initializer_list.pass.cpp
index 60e62cc..d6ff850 100644
--- a/test/strings/basic.string/string.cons/initializer_list.pass.cpp
+++ b/test/strings/basic.string/string.cons/initializer_list.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
diff --git a/test/strings/basic.string/string.cons/iter_alloc.pass.cpp b/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
index 11f2b43..664cb80 100644
--- a/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
+++ b/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
@@ -17,7 +17,7 @@
#include <iterator>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "../input_iterator.h"
#include "min_allocator.h"
diff --git a/test/strings/basic.string/string.cons/move.pass.cpp b/test/strings/basic.string/string.cons/move.pass.cpp
index 873e889..b94f189 100644
--- a/test/strings/basic.string/string.cons/move.pass.cpp
+++ b/test/strings/basic.string/string.cons/move.pass.cpp
@@ -16,7 +16,7 @@
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
diff --git a/test/strings/basic.string/string.cons/move_alloc.pass.cpp b/test/strings/basic.string/string.cons/move_alloc.pass.cpp
index 1f0d5cd..4e8b038 100644
--- a/test/strings/basic.string/string.cons/move_alloc.pass.cpp
+++ b/test/strings/basic.string/string.cons/move_alloc.pass.cpp
@@ -16,7 +16,7 @@
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
diff --git a/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp b/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
index fdcf478..32c9514 100644
--- a/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
+++ b/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
@@ -19,7 +19,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
diff --git a/test/strings/basic.string/string.cons/move_assignment.pass.cpp b/test/strings/basic.string/string.cons/move_assignment.pass.cpp
index 60de3b0..5bc1c8a 100644
--- a/test/strings/basic.string/string.cons/move_assignment.pass.cpp
+++ b/test/strings/basic.string/string.cons/move_assignment.pass.cpp
@@ -17,7 +17,7 @@
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
diff --git a/test/strings/basic.string/string.cons/move_noexcept.pass.cpp b/test/strings/basic.string/string.cons/move_noexcept.pass.cpp
index 42e828b..556aabd 100644
--- a/test/strings/basic.string/string.cons/move_noexcept.pass.cpp
+++ b/test/strings/basic.string/string.cons/move_noexcept.pass.cpp
@@ -17,7 +17,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
diff --git a/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp b/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
index 8aa88c9..f6e9e00 100644
--- a/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
+++ b/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class charT>
diff --git a/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp b/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
index 629e296..f1f107a 100644
--- a/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
+++ b/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class charT>
diff --git a/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp b/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
index a8e6fdf..4dfe906 100644
--- a/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
+++ b/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class charT>
diff --git a/test/strings/basic.string/string.cons/substr.pass.cpp b/test/strings/basic.string/string.cons/substr.pass.cpp
index 3e04a97..2a9bf2a 100644
--- a/test/strings/basic.string/string.cons/substr.pass.cpp
+++ b/test/strings/basic.string/string.cons/substr.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
diff --git a/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp b/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
index 01767e4..4d5d796 100644
--- a/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
+++ b/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
@@ -18,7 +18,7 @@
#include <string>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
diff --git a/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp b/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
index b3892d7..6ba040d 100644
--- a/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
+++ b/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
diff --git a/test/strings/basic.string/test_allocator.h b/test/strings/basic.string/test_allocator.h
deleted file mode 100644
index 8985215..0000000
--- a/test/strings/basic.string/test_allocator.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-
-class test_alloc_base
-{
-protected:
- static int count;
-public:
- static int throw_after;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
- : public test_alloc_base
-{
- int data_;
-
- template <class U> friend class test_allocator;
-public:
-
- typedef unsigned size_type;
- typedef int difference_type;
- typedef T value_type;
- typedef value_type* pointer;
- typedef const value_type* const_pointer;
- typedef typename std::add_lvalue_reference<value_type>::type reference;
- typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
- template <class U> struct rebind {typedef test_allocator<U> other;};
-
- test_allocator() throw() : data_(-1) {}
- explicit test_allocator(int i) throw() : data_(i) {}
- test_allocator(const test_allocator& a) throw()
- : data_(a.data_) {}
- template <class U> test_allocator(const test_allocator<U>& a) throw()
- : data_(a.data_) {}
- ~test_allocator() throw() {data_ = 0;}
- pointer address(reference x) const {return &x;}
- const_pointer address(const_reference x) const {return &x;}
- pointer allocate(size_type n, const void* = 0)
- {
- if (count >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
- throw std::bad_alloc();
-#else
- std::terminate();
-#endif
- }
- ++count;
- return (pointer)std::malloc(n * sizeof(T));
- }
- void deallocate(pointer p, size_type n)
- {std::free(p);}
- size_type max_size() const throw()
- {return UINT_MAX / sizeof(T);}
- void construct(pointer p, const T& val)
- {::new(p) T(val);}
- void destroy(pointer p) {p->~T();}
-
- friend bool operator==(const test_allocator& x, const test_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const test_allocator& x, const test_allocator& y)
- {return !(x == y);}
-};
-
-#endif // TEST_ALLOCATOR_H
diff --git a/test/containers/test_allocator.h b/test/support/test_allocator.h
similarity index 69%
rename from test/containers/test_allocator.h
rename to test/support/test_allocator.h
index eed33a0..3ec7f47 100644
--- a/test/containers/test_allocator.h
+++ b/test/support/test_allocator.h
@@ -6,16 +6,21 @@
#include <cstdlib>
#include <new>
#include <climits>
+#include <cassert>
class test_alloc_base
{
protected:
- static int count;
+ static int time_to_throw;
public:
static int throw_after;
+ static int count;
+ static int alloc_count;
};
int test_alloc_base::count = 0;
+int test_alloc_base::time_to_throw = 0;
+int test_alloc_base::alloc_count = 0;
int test_alloc_base::throw_after = INT_MAX;
template <class T>
@@ -37,29 +42,31 @@
template <class U> struct rebind {typedef test_allocator<U> other;};
- test_allocator() throw() : data_(-1) {}
- explicit test_allocator(int i) throw() : data_(i) {}
+ test_allocator() throw() : data_(0) {++count;}
+ explicit test_allocator(int i) throw() : data_(i) {++count;}
test_allocator(const test_allocator& a) throw()
- : data_(a.data_) {}
+ : data_(a.data_) {++count;}
template <class U> test_allocator(const test_allocator<U>& a) throw()
- : data_(a.data_) {}
- ~test_allocator() throw() {data_ = 0;}
+ : data_(a.data_) {++count;}
+ ~test_allocator() throw() {assert(data_ >= 0); --count; data_ = -1;}
pointer address(reference x) const {return &x;}
const_pointer address(const_reference x) const {return &x;}
pointer allocate(size_type n, const void* = 0)
{
- if (count >= throw_after) {
+ assert(data_ >= 0);
+ if (time_to_throw >= throw_after) {
#ifndef _LIBCPP_NO_EXCEPTIONS
throw std::bad_alloc();
#else
std::terminate();
#endif
}
- ++count;
+ ++time_to_throw;
+ ++alloc_count;
return (pointer)std::malloc(n * sizeof(T));
}
void deallocate(pointer p, size_type n)
- {std::free(p);}
+ {assert(data_ >= 0); --alloc_count; std::free(p);}
size_type max_size() const throw()
{return UINT_MAX / sizeof(T);}
void construct(pointer p, const T& val)
@@ -76,6 +83,37 @@
{return !(x == y);}
};
+template <>
+class test_allocator<void>
+ : public test_alloc_base
+{
+ int data_;
+
+ template <class U> friend class test_allocator;
+public:
+
+ typedef unsigned size_type;
+ typedef int difference_type;
+ typedef void value_type;
+ typedef value_type* pointer;
+ typedef const value_type* const_pointer;
+
+ template <class U> struct rebind {typedef test_allocator<U> other;};
+
+ test_allocator() throw() : data_(-1) {}
+ explicit test_allocator(int i) throw() : data_(i) {}
+ test_allocator(const test_allocator& a) throw()
+ : data_(a.data_) {}
+ template <class U> test_allocator(const test_allocator<U>& a) throw()
+ : data_(a.data_) {}
+ ~test_allocator() throw() {data_ = 0;}
+
+ friend bool operator==(const test_allocator& x, const test_allocator& y)
+ {return x.data_ == y.data_;}
+ friend bool operator!=(const test_allocator& x, const test_allocator& y)
+ {return !(x == y);}
+};
+
template <class T>
class other_allocator
{
diff --git a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
index ea8830b..4feac30 100644
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
+++ b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <functional>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
index 8a16313..5990922 100644
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
+++ b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
@@ -16,7 +16,7 @@
#include <functional>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
class A
{
diff --git a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
index d5364bf..79fc151 100644
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
+++ b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
@@ -18,7 +18,7 @@
#include <cstdlib>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
int new_called = 0;
diff --git a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
index 89efeab..956136b 100644
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
+++ b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
@@ -16,7 +16,7 @@
#include <functional>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
int main()
{
diff --git a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
index cafc6e4..570c27e 100644
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
+++ b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
@@ -16,7 +16,7 @@
#include <functional>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
int new_called = 0;
diff --git a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp
index ae6498b..e9ecfa5 100644
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp
+++ b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <functional>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
class A
{
diff --git a/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h b/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
deleted file mode 100644
index eed33a0..0000000
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-
-class test_alloc_base
-{
-protected:
- static int count;
-public:
- static int throw_after;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
- : public test_alloc_base
-{
- int data_;
-
- template <class U> friend class test_allocator;
-public:
-
- typedef unsigned size_type;
- typedef int difference_type;
- typedef T value_type;
- typedef value_type* pointer;
- typedef const value_type* const_pointer;
- typedef typename std::add_lvalue_reference<value_type>::type reference;
- typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
- template <class U> struct rebind {typedef test_allocator<U> other;};
-
- test_allocator() throw() : data_(-1) {}
- explicit test_allocator(int i) throw() : data_(i) {}
- test_allocator(const test_allocator& a) throw()
- : data_(a.data_) {}
- template <class U> test_allocator(const test_allocator<U>& a) throw()
- : data_(a.data_) {}
- ~test_allocator() throw() {data_ = 0;}
- pointer address(reference x) const {return &x;}
- const_pointer address(const_reference x) const {return &x;}
- pointer allocate(size_type n, const void* = 0)
- {
- if (count >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
- throw std::bad_alloc();
-#else
- std::terminate();
-#endif
- }
- ++count;
- return (pointer)std::malloc(n * sizeof(T));
- }
- void deallocate(pointer p, size_type n)
- {std::free(p);}
- size_type max_size() const throw()
- {return UINT_MAX / sizeof(T);}
- void construct(pointer p, const T& val)
- {::new(p) T(val);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
- void construct(pointer p, T&& val)
- {::new(p) T(std::move(val));}
-#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
- void destroy(pointer p) {p->~T();}
-
- friend bool operator==(const test_allocator& x, const test_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const test_allocator& x, const test_allocator& y)
- {return !(x == y);}
-};
-
-template <class T>
-class other_allocator
-{
- int data_;
-
- template <class U> friend class other_allocator;
-
-public:
- typedef T value_type;
-
- other_allocator() : data_(-1) {}
- explicit other_allocator(int i) : data_(i) {}
- template <class U> other_allocator(const other_allocator<U>& a)
- : data_(a.data_) {}
- T* allocate(std::size_t n)
- {return (T*)std::malloc(n * sizeof(T));}
- void deallocate(T* p, std::size_t n)
- {std::free(p);}
-
- other_allocator select_on_container_copy_construction() const
- {return other_allocator(-2);}
-
- friend bool operator==(const other_allocator& x, const other_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const other_allocator& x, const other_allocator& y)
- {return !(x == y);}
-
- typedef std::true_type propagate_on_container_copy_assignment;
- typedef std::true_type propagate_on_container_move_assignment;
- typedef std::true_type propagate_on_container_swap;
-
-#ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE
- std::size_t max_size() const
- {return UINT_MAX / sizeof(T);}
-#endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-};
-
-#endif // TEST_ALLOCATOR_H
diff --git a/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h b/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h
deleted file mode 100644
index d9b72bc..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-#include <cassert>
-
-class test_alloc_base
-{
-protected:
- static int time_to_throw;
-public:
- static int throw_after;
- static int count;
- static int alloc_count;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::time_to_throw = 0;
-int test_alloc_base::alloc_count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
- : public test_alloc_base
-{
- int data_;
-
- template <class U> friend class test_allocator;
-public:
-
- typedef unsigned size_type;
- typedef int difference_type;
- typedef T value_type;
- typedef value_type* pointer;
- typedef const value_type* const_pointer;
- typedef typename std::add_lvalue_reference<value_type>::type reference;
- typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
- template <class U> struct rebind {typedef test_allocator<U> other;};
-
- test_allocator() throw() : data_(0) {++count;}
- explicit test_allocator(int i) throw() : data_(i) {++count;}
- test_allocator(const test_allocator& a) throw()
- : data_(a.data_) {++count;}
- template <class U> test_allocator(const test_allocator<U>& a) throw()
- : data_(a.data_) {++count;}
- ~test_allocator() throw() {assert(data_ >= 0); --count; data_ = -1;}
- pointer address(reference x) const {return &x;}
- const_pointer address(const_reference x) const {return &x;}
- pointer allocate(size_type n, const void* = 0)
- {
- assert(data_ >= 0);
- if (time_to_throw >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
- throw std::bad_alloc();
-#else
- std::terminate();
-#endif
- }
- ++time_to_throw;
- ++alloc_count;
- return (pointer)std::malloc(n * sizeof(T));
- }
- void deallocate(pointer p, size_type n)
- {assert(data_ >= 0); --alloc_count; std::free(p);}
- size_type max_size() const throw()
- {return UINT_MAX / sizeof(T);}
- void construct(pointer p, const T& val)
- {::new(p) T(val);}
- void destroy(pointer p) {p->~T();}
-
- friend bool operator==(const test_allocator& x, const test_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const test_allocator& x, const test_allocator& y)
- {return !(x == y);}
-};
-
-#endif // TEST_ALLOCATOR_H
diff --git a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
index 509752e..7966e00 100644
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
+++ b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
@@ -14,7 +14,7 @@
#include <memory>
#include <cassert>
#include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
struct A
{
diff --git a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
index 6d14920..ab2c73e 100644
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
+++ b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
@@ -14,7 +14,7 @@
#include <memory>
#include <cassert>
#include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
struct A
{
diff --git a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
index 98ecd13..23d3f10 100644
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
+++ b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
@@ -14,7 +14,7 @@
#include <memory>
#include <cassert>
#include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
struct A
{
diff --git a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
index 9b93a7c..4220993 100644
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
+++ b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
@@ -14,7 +14,7 @@
#include <memory>
#include <cassert>
#include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
struct A
{
diff --git a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
index 5c9d9a3..e019837 100644
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
+++ b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
@@ -18,7 +18,7 @@
#include <new>
#include <cstdlib>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
int new_count = 0;
diff --git a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
index 42360d6..09070e2 100644
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
+++ b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
@@ -16,7 +16,7 @@
#include <memory>
#include <cassert>
#include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
struct B
{