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
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
index 135293d..a20d6ab 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class InIter, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp
index 5827171..039fd2f 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class InIter, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
index 6e94cd9..ab402a5 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
struct Pred
{
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
index cb75591..f594a0b 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class InIter, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp
index 7960800..c72adac 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
index 309d8a9..b9be7c0 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp
index bdf6acc..f166d67 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
struct gen_test
{
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp
index 64c6b00..2494191 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
struct gen_test
{
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
index 4eb6e91..43234be 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
@@ -20,7 +20,7 @@
#include <memory>
#endif
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class InIter, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
index 6458437..02b6b16 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
@@ -20,7 +20,7 @@
#include <memory>
#endif
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class InIter, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
index 2f7c026..6098a20 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
struct is_odd
{
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp
index 81fb407..8eddfbc 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp
@@ -21,7 +21,7 @@
#include <memory>
#endif
-#include "../../../iterators.h"
+#include "test_iterators.h"
struct is_odd
{
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
index 8c28bdf..67e1ccc 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
@@ -19,7 +19,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
struct is_odd
{
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp
index 6056576..f5b832c 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
struct is_odd
{
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp
index 41bb315..7810dec 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp
@@ -21,7 +21,7 @@
#include <memory>
#endif
-#include "../../../iterators.h"
+#include "test_iterators.h"
struct is_odd
{
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp
index 8ca008f..80f8656 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp
@@ -21,7 +21,7 @@
#include <memory>
#endif
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
index 1bb2e63..bf5f79c 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class InIter, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
index 7fb1d04..de3f0a7 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
@@ -19,7 +19,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class InIter, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp
index 7493b87..6da3a67 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp
@@ -22,7 +22,7 @@
#include <memory>
#endif
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp
index 3a4f3bf..f603335 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp
@@ -19,7 +19,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
index 02bf2aa..3c4d0e5 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
@@ -20,7 +20,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class InIter, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
index d8c142e..1eff3d3 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
@@ -21,7 +21,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class InIter, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp
index a22e7fa..8d6ab04 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp
@@ -20,7 +20,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp
index 4656a9d..6c49605 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
index e6ffd4d..70840d1 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class InIter, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp
index 949bb5c..b7da735 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp
@@ -19,7 +19,7 @@
#include <memory>
#endif
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
index b8a764d..f2ad535a 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class InIter, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp
index 9366564..24fc47e 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp
@@ -20,7 +20,7 @@
#include <memory>
#endif
-#include "../../../iterators.h"
+#include "test_iterators.h"
template<class Iter1, class Iter2>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
index 95455ff..8491ea5 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
@@ -19,7 +19,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template<class InIter1, class InIter2, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
index 9c9c0d2..68556fd 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
@@ -19,7 +19,7 @@
#include <functional>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class InIter, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
index ca6eee6..ab4ffad 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
@@ -21,7 +21,7 @@
#include <memory>
#endif
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class Iter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
index e3a59b8..761dad4 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
@@ -20,7 +20,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
template <class InIter, class OutIter>
void
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
index 2e62ab6..6819899 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
@@ -21,7 +21,7 @@
#include <algorithm>
#include <cassert>
-#include "../../../iterators.h"
+#include "test_iterators.h"
struct count_equal
{
diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
index 58df57d..c6df235 100644
--- a/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
+++ b/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
@@ -21,7 +21,7 @@
#include <memory>
#endif
-#include "../../../iterators.h"
+#include "test_iterators.h"
struct count_equal
{