From bc32b5cf8f4c9f8243fe7b914500bee3bb6473c0 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Fri, 29 Apr 2016 01:52:57 +0000 Subject: [PATCH] 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. llvm-svn: 267973 --- .../function.objects/func.require/bullet_1_2_3.pass.cpp | 0 .../function.objects/func.require/bullet_4_5_6.pass.cpp | 0 .../function.objects/func.require/bullet_7.pass.cpp | 0 .../function.objects/func.require/invoke.pass.cpp | 15 +++++---------- .../function.objects/func.require/invoke_helpers.h | 0 .../func.require/INVOKE_tested_elsewhere.pass.cpp | 16 ++++++++++++++++ 6 files changed, 21 insertions(+), 10 deletions(-) rename libcxx/test/{std => libcxx}/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp (100%) rename libcxx/test/{std => libcxx}/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp (100%) rename libcxx/test/{std => libcxx}/utilities/function.objects/func.require/bullet_7.pass.cpp (100%) rename libcxx/test/{std => libcxx}/utilities/function.objects/func.require/invoke.pass.cpp (87%) rename libcxx/test/{std => libcxx}/utilities/function.objects/func.require/invoke_helpers.h (100%) create mode 100644 libcxx/test/std/utilities/function.objects/func.require/INVOKE_tested_elsewhere.pass.cpp diff --git a/libcxx/test/std/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp b/libcxx/test/libcxx/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp rename to libcxx/test/libcxx/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp diff --git a/libcxx/test/std/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp b/libcxx/test/libcxx/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp rename to libcxx/test/libcxx/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp diff --git a/libcxx/test/std/utilities/function.objects/func.require/bullet_7.pass.cpp b/libcxx/test/libcxx/utilities/function.objects/func.require/bullet_7.pass.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/func.require/bullet_7.pass.cpp rename to libcxx/test/libcxx/utilities/function.objects/func.require/bullet_7.pass.cpp diff --git a/libcxx/test/std/utilities/function.objects/func.require/invoke.pass.cpp b/libcxx/test/libcxx/utilities/function.objects/func.require/invoke.pass.cpp similarity index 87% rename from libcxx/test/std/utilities/function.objects/func.require/invoke.pass.cpp rename to libcxx/test/libcxx/utilities/function.objects/func.require/invoke.pass.cpp index 2568163..1d42513 100644 --- a/libcxx/test/std/utilities/function.objects/func.require/invoke.pass.cpp +++ b/libcxx/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 +#include + +#include "test_macros.h" template struct Array @@ -26,10 +24,9 @@ struct Type { Array::type& f1(); Array::type& f2() const; - +#if TEST_STD_VER >= 11 Array::type& g1() &; Array::type& g2() const &; -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES Array::type& g3() &&; Array::type& g4() const &&; #endif @@ -39,12 +36,10 @@ int main() { static_assert(sizeof(std::__invoke(&Type::f1, std::declval())) == 1, ""); static_assert(sizeof(std::__invoke(&Type::f2, std::declval())) == 2, ""); - +#if TEST_STD_VER >= 11 static_assert(sizeof(std::__invoke(&Type::g1, std::declval())) == 1, ""); static_assert(sizeof(std::__invoke(&Type::g2, std::declval())) == 2, ""); -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES static_assert(sizeof(std::__invoke(&Type::g3, std::declval())) == 3, ""); static_assert(sizeof(std::__invoke(&Type::g4, std::declval())) == 4, ""); #endif } -#endif diff --git a/libcxx/test/std/utilities/function.objects/func.require/invoke_helpers.h b/libcxx/test/libcxx/utilities/function.objects/func.require/invoke_helpers.h similarity index 100% rename from libcxx/test/std/utilities/function.objects/func.require/invoke_helpers.h rename to libcxx/test/libcxx/utilities/function.objects/func.require/invoke_helpers.h diff --git a/libcxx/test/std/utilities/function.objects/func.require/INVOKE_tested_elsewhere.pass.cpp b/libcxx/test/std/utilities/function.objects/func.require/INVOKE_tested_elsewhere.pass.cpp new file mode 100644 index 0000000..d61c377 --- /dev/null +++ b/libcxx/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() {} -- 2.7.4