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

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()

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()

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()

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()

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()

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

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)
 

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()

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()

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()

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()

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()

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

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

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"
 

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

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()

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()

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()

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()

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()

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

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)
 

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()

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()

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()

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()

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()

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

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

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"
 

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

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()
 {

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()
 {

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()
 {

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()
 {

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()
 {

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

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)
 

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()
 {

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()
 {

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()

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()
 {

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()

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

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

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()

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

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()
 {

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()
 {

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()
 {

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()
 {

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()
 {

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

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)
 

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()
 {

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()
 {

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()

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()
 {

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()

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

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

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()

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

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

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

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

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

test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp

@@ -25,7 +25,7 @@ make(int n)
     return c;
 }
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct test

test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp

@@ -29,7 +29,7 @@ make(int n)
     return c;
 }
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct test

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> > >

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

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

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

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

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> > >

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

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

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

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

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"
 

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>

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>

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

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)
 

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()

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>

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()

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()

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()

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

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

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>

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>

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

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"
 

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;
 

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;
 

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()

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"