summaryrefslogtreecommitdiffstats
path: root/libcxx/test/algorithms/alg.sorting
diff options
context:
space:
mode:
authorMarshall Clow <mclow@qualcomm.com>2013-01-04 18:24:04 +0000
committerMarshall Clow <mclow@qualcomm.com>2013-01-04 18:24:04 +0000
commitf8c2b823378fed0c5e11b7fa84ce2876e606a67a (patch)
treeb7a252e269cb926deaaf442c05ebc7595d942c1c /libcxx/test/algorithms/alg.sorting
parent2060482ece6b810d930abaaa6ae3ae53dce97292 (diff)
downloadbcm5719-llvm-f8c2b823378fed0c5e11b7fa84ce2876e606a67a.tar.gz
bcm5719-llvm-f8c2b823378fed0c5e11b7fa84ce2876e606a67a.zip
...and then there was one. Only one copy of 'iterators.h' in the test tree for libc++
llvm-svn: 171479
Diffstat (limited to 'libcxx/test/algorithms/alg.sorting')
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp2
-rw-r--r--libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp2
40 files changed, 40 insertions, 40 deletions
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp
index 8f2dc516259..bf1c5dd3651 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp
@@ -19,7 +19,7 @@
#include <vector>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter, class T>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp
index 44d792fc2df..2860955b82b 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp
@@ -20,7 +20,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter, class T>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp
index dc77dc5c94b..e15c9c1cf01 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp
@@ -19,7 +19,7 @@
#include <vector>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter, class T>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp
index 5c95e8bac85..cd17c4c1596 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp
@@ -20,7 +20,7 @@
#include <vector>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter, class T>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp
index 5a9be2024b0..804f65d9222 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp
@@ -18,7 +18,7 @@
#include <vector>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter, class T>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp
index aba62daae23..f68c670ed6d 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp
@@ -19,7 +19,7 @@
#include <vector>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter, class T>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp
index b6aa17e9326..9c4ee64d89c 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp
@@ -18,7 +18,7 @@
#include <vector>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter, class T>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp
index 319e6dd8240..abc7d880a5c 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp
@@ -19,7 +19,7 @@
#include <vector>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter, class T>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
index b306a316733..f3b294f22f7 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class Iter1, class Iter2>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
index de5253f8a97..1c78a50620c 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
@@ -20,7 +20,7 @@
#include <functional>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class Iter1, class Iter2>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
index d8c5221c52f..f4317eb2f71 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
index 091068c89d5..7bc0809f472 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
@@ -30,7 +30,7 @@ struct indirect_less
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp
index 97bc7a8f983..0536813aabb 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp
@@ -19,7 +19,7 @@
#include <algorithm>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class InIter1, class InIter2, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
index 5ae38052994..77c072727c6 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
@@ -22,7 +22,7 @@
#include <functional>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class InIter1, class InIter2, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
index 3e7d5d73339..4681041a537 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
index fe03492abb5..d4bde658b54 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
@@ -18,7 +18,7 @@
#include <functional>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
index c20d061e79a..cba481368be 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
index c6b85399c06..698729813ec 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
@@ -18,7 +18,7 @@
#include <functional>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
index 4e19beabde0..daf1990c79e 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
index f278df69fa1..6bd532dbcfe 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
@@ -18,7 +18,7 @@
#include <functional>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp
index ea8acb5debc..422f6e7acfb 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
#include <cstdio>
diff --git a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp
index 27723004c7f..caea596cf7c 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp
@@ -19,7 +19,7 @@
#include <functional>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
#include <cstdio>
diff --git a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp
index 99665775e48..ddff3ba12fb 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
#include <cstdio>
diff --git a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp
index c4ed0989cb7..220c8d68e22 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp
@@ -19,7 +19,7 @@
#include <functional>
#include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
#include <cstdio>
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
index 9cc04cbb95a..ab9df3e6dec 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter1, class Iter2>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
index 137d64eaa80..cc904f6e30a 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
@@ -19,7 +19,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter1, class Iter2>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
index 316b9983a90..1f7001ac07d 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
@@ -21,7 +21,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter1, class Iter2, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
index 371ee700431..6217c45ee71 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
@@ -23,7 +23,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter1, class Iter2, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
index c10933168fd..eea9972b465 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
@@ -21,7 +21,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter1, class Iter2, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
index 7e68e81ebce..7f02ffd56a0 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
@@ -23,7 +23,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter1, class Iter2, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
index 9d8f7accdd1..46a564873d7 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
@@ -22,7 +22,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter1, class Iter2, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
index f73ce33836e..ae880e45741 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
@@ -24,7 +24,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter1, class Iter2, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
index 2ee894b37e8..8b18c504d46 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
@@ -21,7 +21,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter1, class Iter2, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
index 6ddcc143572..0051e27c300 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
@@ -23,7 +23,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter1, class Iter2, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
index b473dda627d..af75647f867 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
index 9ca390f5daa..cdeb3cd9be2 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
@@ -18,7 +18,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
index 5c551727352..8dc1f835667 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
index c055641fd7e..2e445cfccce 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
@@ -18,7 +18,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
index c7f714fd14c..577dd9265bd 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
@@ -20,7 +20,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
index adf51c53b61..a075d02aed2 100644
--- a/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
+++ b/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
@@ -23,7 +23,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
template <class Iter>
void
OpenPOWER on IntegriCloud