We had two identical files named 'MoveOnly.h' in the test suite. Move one to support/, remove the other, and update all the tests that included them. No functionality change.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@227370 91177308-0d34-0410-b5e6-96231b3b80d8
2015-01-28 21:22:53 +00:00 · 2015-01-28 21:22:53 +00:00 · df00d5e5ad
commit df00d5e5ad
parent eea9d20edb
157 changed files with 155 additions and 205 deletions
--- a/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp
+++ b/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp
@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp
+++ b/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp
@ -20,7 +20,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
+++ b/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
@ -14,7 +14,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 #if __has_feature(cxx_noexcept)
--- a/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp
+++ b/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp
@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "../../../test_compare.h"
 #include "test_allocator.h"
 #include "min_allocator.h"
--- a/test/std/containers/associative/map/map.cons/move_assign.pass.cpp
+++ b/test/std/containers/associative/map/map.cons/move_assign.pass.cpp
@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "../../../test_compare.h"
 #include "test_allocator.h"
 #include "min_allocator.h"
--- a/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
+++ b/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
@ -20,7 +20,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp
+++ b/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
+++ b/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp
+++ b/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp
@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/associative/map/map.special/swap_noexcept.pass.cpp
+++ b/test/std/containers/associative/map/map.special/swap_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
+++ b/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
@ -20,7 +20,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
+++ b/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
@ -14,7 +14,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 #if __has_feature(cxx_noexcept)
--- a/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
+++ b/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "../../../test_compare.h"
 #include "test_allocator.h"
 #include "min_allocator.h"
--- a/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
+++ b/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "../../../test_compare.h"
 #include "test_allocator.h"
 #include "min_allocator.h"
--- a/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
+++ b/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
@ -20,7 +20,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
+++ b/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
+++ b/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
+++ b/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
+++ b/test/std/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <map>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp
+++ b/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp
@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>

-#include "../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/associative/multiset/insert_rv.pass.cpp
+++ b/test/std/containers/associative/multiset/insert_rv.pass.cpp
@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>

-#include "../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
+++ b/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
@ -20,7 +20,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
+++ b/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
@ -14,7 +14,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 #if __has_feature(cxx_noexcept)
--- a/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
+++ b/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "../../../test_compare.h"
 #include "test_allocator.h"
 #include "Counter.h"
--- a/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
+++ b/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "../../../test_compare.h"
 #include "test_allocator.h"
 #include "min_allocator.h"
--- a/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
+++ b/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
@ -20,7 +20,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
+++ b/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
+++ b/test/std/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/set/insert_iter_rv.pass.cpp
+++ b/test/std/containers/associative/set/insert_iter_rv.pass.cpp
@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>

-#include "../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/associative/set/insert_rv.pass.cpp
+++ b/test/std/containers/associative/set/insert_rv.pass.cpp
@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>

-#include "../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp
+++ b/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp
@ -20,7 +20,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
+++ b/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
@ -14,7 +14,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 #if __has_feature(cxx_noexcept)
--- a/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp
+++ b/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp
@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "../../../test_compare.h"
 #include "test_allocator.h"
 #include "Counter.h"
--- a/test/std/containers/associative/set/set.cons/move_assign.pass.cpp
+++ b/test/std/containers/associative/set/set.cons/move_assign.pass.cpp
@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "../../../test_compare.h"
 #include "test_allocator.h"
 #include "min_allocator.h"
--- a/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
+++ b/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
@ -20,7 +20,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp
+++ b/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/associative/set/set.special/swap_noexcept.pass.cpp
+++ b/test/std/containers/associative/set/set.special/swap_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <set>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
+++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp
+++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp
@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp
+++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp
@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp
+++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp
@ -16,7 +16,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp
+++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp
@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp
@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp
+++ b/test/std/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp
@ -16,7 +16,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
+++ b/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
@ -16,7 +16,7 @@
 #include <cassert>

 #include "test_allocator.h"
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
+++ b/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
@ -16,7 +16,7 @@
 #include <cassert>

 #include "test_allocator.h"
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp
+++ b/test/std/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp
@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp
+++ b/test/std/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp
@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp
@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp
+++ b/test/std/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp
@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp
+++ b/test/std/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp
@ -14,7 +14,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <queue>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
+++ b/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
@ -16,7 +16,7 @@
 #include <cassert>

 #include "test_allocator.h"
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
+++ b/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
@ -16,7 +16,7 @@
 #include <cassert>

 #include "test_allocator.h"
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp
+++ b/test/std/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp
@ -14,7 +14,7 @@
 #include <stack>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp
+++ b/test/std/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp
@ -14,7 +14,7 @@
 #include <stack>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <stack>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp
@ -14,7 +14,7 @@
 #include <stack>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <stack>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <stack>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp
+++ b/test/std/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp
@ -14,7 +14,7 @@
 #include <stack>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/std/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp
+++ b/test/std/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp
@ -14,7 +14,7 @@
 #include <stack>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp
+++ b/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <stack>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"

 int main()
 {
--- a/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <deque>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 #if __has_feature(cxx_noexcept)
--- a/test/std/containers/sequences/deque/deque.cons/move.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.cons/move.pass.cpp
@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"
 #include "min_allocator.h"

--- a/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"
 #include "min_allocator.h"

--- a/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp
@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"
 #include "min_allocator.h"

--- a/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
@ -19,7 +19,7 @@
 #include <deque>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <deque>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
@ -18,7 +18,7 @@
 #include <cassert>

 #include "test_iterators.h"
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "../../../stack_allocator.h"
 #include "min_allocator.h"

--- a/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
--- a/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
@ -16,7 +16,7 @@
 #include <deque>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
--- a/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
--- a/test/std/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <deque>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
+++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
@ -16,7 +16,7 @@
 #include <iterator>

 #include "test_allocator.h"
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
+++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <forward_list>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
+++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 #if __has_feature(cxx_noexcept)
--- a/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
+++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
@ -16,7 +16,7 @@
 #include <iterator>

 #include "test_allocator.h"
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
+++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
@ -16,7 +16,7 @@
 #include <iterator>

 #include "test_allocator.h"
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
+++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
@ -19,7 +19,7 @@
 #include <forward_list>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
+++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <forward_list>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
+++ b/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
+++ b/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
+++ b/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/std/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
+++ b/test/std/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
@ -18,7 +18,7 @@
 #include <forward_list>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp
+++ b/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp
@ -13,7 +13,7 @@

 #include <list>
 #include <cassert>
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"
 #include "min_allocator.h"

--- a/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp
+++ b/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <list>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
+++ b/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 #if __has_feature(cxx_noexcept)
--- a/test/std/containers/sequences/list/list.cons/move.pass.cpp
+++ b/test/std/containers/sequences/list/list.cons/move.pass.cpp
@ -13,7 +13,7 @@

 #include <list>
 #include <cassert>
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"
 #include "min_allocator.h"

--- a/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp
+++ b/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp
@ -13,7 +13,7 @@

 #include <list>
 #include <cassert>
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"
 #include "min_allocator.h"

--- a/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
+++ b/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
@ -19,7 +19,7 @@
 #include <list>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp
+++ b/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp
@ -17,7 +17,7 @@
 #include <list>
 #include <cassert>

-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
 #include "test_allocator.h"

 template <class T>
--- a/Show More
+++ b/Show More