Move common header files into a 'support' directory; make 'testit' include -I to that directory; rename 'iterators.h' to 'iterator_test.h'; remove hard-coded paths to include files from more than 350 source files

llvm-svn: 171594

58 files changed, 58 insertions, 58 deletions

diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
index 6f26dfe3617..307e3e42f39 100644
--- a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
index 071c088886a..fcd4cee8f9b 100644
--- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp b/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp
index 5a09b087301..231e0c57a6e 100644
--- a/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
index 34d22267a9b..d8a3c145370 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
index 5f32267fb6b..a83e2ae581d 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
@@ -18,7 +18,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
 
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
index 3c2f6e3ed86..0bbaaf12eab 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp b/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp
index a22f5f834a8..3bc3a61544d 100644
--- a/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp b/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp
index e1030c552b7..ff068503e5b 100644
--- a/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
index 6986db5460a..9b4992bdb09 100644
--- a/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
@@ -18,7 +18,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
 
diff --git a/libcxx/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp b/libcxx/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
index ee07bb2ca37..18bc0839003 100644
--- a/libcxx/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
index 6ce1bf8d605..da5a61630b4 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
@@ -15,7 +15,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 std::deque<int>
 make(int size, int start = 0 )
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
index d7d8668c1a6..b92ba136a3d 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 std::deque<int>
 make(int size, int start = 0 )
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
index 4c6604f489e..a43c344cb9b 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../stack_allocator.h"
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 template <class InputIterator>
 void
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
index 86271fa455c..cfa86a94e88 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_allocator.h"
 
 template <class InputIterator, class Allocator>
diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
index 777fc7e44f6..7132ff4c6a3 100644
--- a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
@@ -15,7 +15,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../MoveOnly.h"
 #include "../../../stack_allocator.h"
 
diff --git a/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp
index bca245e6669..c5ef688be52 100644
--- a/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp
@@ -18,7 +18,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 std::deque<int>
 make(int size, int start = 0 )
diff --git a/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp
index 74e84bc1a58..7544ba82836 100644
--- a/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp
@@ -18,7 +18,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 std::deque<int>
 make(int size, int start = 0 )
diff --git a/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp
index 36c37e0075c..c4d36513e8d 100644
--- a/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp
@@ -18,7 +18,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 std::deque<int>
 make(int size, int start = 0 )
diff --git a/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp
index 5b4726e4a96..b56bf721bcb 100644
--- a/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp
@@ -18,7 +18,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 std::deque<int>
 make(int size, int start = 0 )
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
index db6b587d461..38fef428725 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
index 2986f61451e..e9c8aba916f 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
index 5709c7b0bd1..0eec764f3fe 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
@@ -18,7 +18,7 @@
 #include <iterator>
 
 #include "../../../test_allocator.h"
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
index 544eb0b73f0..4d8ccc2e46a 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
@@ -16,7 +16,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
index 760a15e07f9..859f6bca6b4 100644
--- a/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
@@ -14,7 +14,7 @@
 
 #include <list>
 #include <cassert>
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../stack_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
index b64fd2d51be..e2c01ee4d9f 100644
--- a/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class C, class Iterator>
 void
diff --git a/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
index df99cb53384..70932b114b9 100644
--- a/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 template <class C, class Iterator>
 void
diff --git a/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
index 1f24c2e00dd..6d150cdd0fe 100644
--- a/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
@@ -15,7 +15,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
index c284f63bad1..9c9b88e73dd 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../stack_allocator.h"
 
 template <class C, class Iterator>
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
index 8f21cd21993..17bba911e32 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../stack_allocator.h"
 
 template <class C, class Iterator>
diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
index 878258ca13a..84998b24eac 100644
--- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
index 9b9d5ab5994..0c4ccec7f39 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
index 9be6a3bf01f..0d8b1a7e4ce 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
index 05fa7889a60..0d55b26c1af 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
@@ -22,7 +22,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
index 4f4784fb452..0c81503e17f 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
@@ -22,7 +22,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
index d4f7b9f3490..c8371ce006e 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -23,7 +23,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp
index ee605575b32..532c7cb22cc 100644
--- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp
index 2f01680ded8..eda189a7a1a 100644
--- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp
@@ -20,7 +20,7 @@
 #include <string>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
index 1055fbfd6ef..5894e63792c 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
index 1ab664e1701..c02aa5336d6 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
index fb2b6a421a5..c3ce6189dce 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
@@ -22,7 +22,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
index 23a38b2cf22..a13eba0e9c3 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
@@ -22,7 +22,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
index 8abeb3bd04b..402ef6bef92 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -23,7 +23,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
index 1cdc45ebee5..cab85081d87 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
index 43b6c994106..fa445472774 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
@@ -20,7 +20,7 @@
 #include <string>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/unord/unord.multiset/insert_init.pass.cpp b/libcxx/test/containers/unord/unord.multiset/insert_init.pass.cpp
index bb4216d5a7d..db82f65ac5a 100644
--- a/libcxx/test/containers/unord/unord.multiset/insert_init.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/insert_init.pass.cpp
@@ -18,7 +18,7 @@
 #include <unordered_set>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/unord/unord.multiset/insert_range.pass.cpp b/libcxx/test/containers/unord/unord.multiset/insert_range.pass.cpp
index 44dddfdb0ba..93d5e837735 100644
--- a/libcxx/test/containers/unord/unord.multiset/insert_range.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/insert_range.pass.cpp
@@ -19,7 +19,7 @@
 #include <unordered_set>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
index ac977595f72..92a5e98d0e4 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
index 1fdee83934f..6d2aff60601 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
index 0f3ff9741d6..fbec983692c 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
index c0f3c310e93..c70187566ab 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
index 585adeb18fa..ba94ac43e4c 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -22,7 +22,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"
diff --git a/libcxx/test/containers/unord/unord.set/insert_init.pass.cpp b/libcxx/test/containers/unord/unord.set/insert_init.pass.cpp
index 57588f442f1..3b1abdf4896 100644
--- a/libcxx/test/containers/unord/unord.set/insert_init.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/insert_init.pass.cpp
@@ -18,7 +18,7 @@
 #include <unordered_set>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/unord/unord.set/insert_range.pass.cpp b/libcxx/test/containers/unord/unord.set/insert_range.pass.cpp
index cf713026acd..b0b8fc62874 100644
--- a/libcxx/test/containers/unord/unord.set/insert_range.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/insert_range.pass.cpp
@@ -19,7 +19,7 @@
 #include <unordered_set>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "test_iterators.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
index 6419f3339af..1515a0c2df7 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
index 531a5f03ac6..33d8f3a1149 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
index d84d7266082..deabebdbeab 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
index 266c2cbb134..a0fafaddee3 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
index b2e9914875d..c6153df62be 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -22,7 +22,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../../iterators.h"
+#include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"