Move INVOKE tests into test/libcxx sub-tree.
Testing the concrete implementation of INVOKE means calling the implementation
specific names `__invoke` and `__invoke_constexpr`. For this reason the test
are non-standard. For this reason it's best if the tests live outside of the
`test/std` directory.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@267973 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/std/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp b/test/libcxx/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp
similarity index 100%
rename from test/std/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp
rename to test/libcxx/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp
diff --git a/test/std/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp b/test/libcxx/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp
similarity index 100%
rename from test/std/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp
rename to test/libcxx/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp
diff --git a/test/std/utilities/function.objects/func.require/bullet_7.pass.cpp b/test/libcxx/utilities/function.objects/func.require/bullet_7.pass.cpp
similarity index 100%
rename from test/std/utilities/function.objects/func.require/bullet_7.pass.cpp
rename to test/libcxx/utilities/function.objects/func.require/bullet_7.pass.cpp
diff --git a/test/std/utilities/function.objects/func.require/invoke.pass.cpp b/test/libcxx/utilities/function.objects/func.require/invoke.pass.cpp
similarity index 87%
rename from test/std/utilities/function.objects/func.require/invoke.pass.cpp
rename to test/libcxx/utilities/function.objects/func.require/invoke.pass.cpp
index 2568163..1d42513 100644
--- a/test/std/utilities/function.objects/func.require/invoke.pass.cpp
+++ b/test/libcxx/utilities/function.objects/func.require/invoke.pass.cpp
@@ -9,12 +9,10 @@
// [func.require]
-// INVOKE
-#if __cplusplus < 201103L
-int main () {} // no __invoke in C++03
-#else
-
#include <type_traits>
+#include <functional>
+
+#include "test_macros.h"
template <typename T, int N>
struct Array
@@ -26,10 +24,9 @@
{
Array<char, 1>::type& f1();
Array<char, 2>::type& f2() const;
-
+#if TEST_STD_VER >= 11
Array<char, 1>::type& g1() &;
Array<char, 2>::type& g2() const &;
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
Array<char, 3>::type& g3() &&;
Array<char, 4>::type& g4() const &&;
#endif
@@ -39,12 +36,10 @@
{
static_assert(sizeof(std::__invoke(&Type::f1, std::declval<Type >())) == 1, "");
static_assert(sizeof(std::__invoke(&Type::f2, std::declval<Type const >())) == 2, "");
-
+#if TEST_STD_VER >= 11
static_assert(sizeof(std::__invoke(&Type::g1, std::declval<Type &>())) == 1, "");
static_assert(sizeof(std::__invoke(&Type::g2, std::declval<Type const &>())) == 2, "");
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
static_assert(sizeof(std::__invoke(&Type::g3, std::declval<Type &&>())) == 3, "");
static_assert(sizeof(std::__invoke(&Type::g4, std::declval<Type const&&>())) == 4, "");
#endif
}
-#endif
diff --git a/test/std/utilities/function.objects/func.require/invoke_helpers.h b/test/libcxx/utilities/function.objects/func.require/invoke_helpers.h
similarity index 100%
rename from test/std/utilities/function.objects/func.require/invoke_helpers.h
rename to test/libcxx/utilities/function.objects/func.require/invoke_helpers.h
diff --git a/test/std/utilities/function.objects/func.require/INVOKE_tested_elsewhere.pass.cpp b/test/std/utilities/function.objects/func.require/INVOKE_tested_elsewhere.pass.cpp
new file mode 100644
index 0000000..d61c377
--- /dev/null
+++ b/test/std/utilities/function.objects/func.require/INVOKE_tested_elsewhere.pass.cpp
@@ -0,0 +1,16 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// INVOKE (f, t1, t2, ..., tN)
+
+// The tests for INVOKE (f, t1, t2, ..., tN) live in the "test/libcxx" tree
+// since they require calling the implementation specific "__invoke" and
+// "__invoke_constexpr" functions.
+
+int main() {}
