diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-06-01 21:05:53 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-06-01 21:05:53 +0000 |
| commit | eb5cfb02d6a3c757940d8ad3f31a4286535a32ad (patch) | |
| tree | 61c64393998a42a844b8ee101abb75128f377bd7 /libcxx | |
| parent | f807dce6da05ef506b6a21b611f855f9eb209692 (diff) | |
| download | bcm5719-llvm-eb5cfb02d6a3c757940d8ad3f31a4286535a32ad.tar.gz bcm5719-llvm-eb5cfb02d6a3c757940d8ad3f31a4286535a32ad.zip | |
Cleanup non-standard tests as reported by STL@microsoft.com. NFC.
This patch addresses the following issues in the test suite:
1. Move "std::bad_array_length" test from std/ to libcxx/ test directory
since the feature is not a part of the standard.
2. Rename "futures.tas" test directory to "futures.task" since that is the
correct stable name.
3. Move tests for "packaged_task<T>::result_type" from std/ to libcxx/
test directory since the typedef is a libc++ extension.
llvm-svn: 271430
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/future | 6 | ||||
| -rw-r--r-- | libcxx/test/libcxx/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp (renamed from libcxx/test/std/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/libcxx/thread/futures/futures.task/types.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/types.pass.cpp) | 4 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_copy.fail.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_move.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor1.fail.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor1.fail.cpp) | 2 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor2.fail.cpp) | 2 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_copy.fail.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_default.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_move.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/dtor.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/dtor.pass.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/get_future.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/get_future.pass.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/make_ready_at_thread_exit.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.pass.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/operator.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/operator.pass.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/reset.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/reset.pass.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/swap.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.members/swap.pass.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/swap.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp) | 0 | ||||
| -rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp (renamed from libcxx/test/std/thread/futures/futures.tas/futures.task.nonmembers/uses_allocator.pass.cpp) | 0 |
20 files changed, 8 insertions, 6 deletions
diff --git a/libcxx/include/future b/libcxx/include/future index 3bbb925863e..936060e173b 100644 --- a/libcxx/include/future +++ b/libcxx/include/future @@ -322,7 +322,7 @@ template <class R, class... ArgTypes> class packaged_task<R(ArgTypes...)> { public: - typedef R result_type; + typedef R result_type; // extension // construction and destruction packaged_task() noexcept; @@ -1998,7 +1998,7 @@ template<class _Rp, class ..._ArgTypes> class _LIBCPP_TYPE_VIS_ONLY packaged_task<_Rp(_ArgTypes...)> { public: - typedef _Rp result_type; + typedef _Rp result_type; // extension private: __packaged_task_function<result_type(_ArgTypes...)> __f_; @@ -2127,7 +2127,7 @@ template<class ..._ArgTypes> class _LIBCPP_TYPE_VIS_ONLY packaged_task<void(_ArgTypes...)> { public: - typedef void result_type; + typedef void result_type; // extension private: __packaged_task_function<result_type(_ArgTypes...)> __f_; diff --git a/libcxx/test/std/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp b/libcxx/test/libcxx/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp index cc99b83aca4..cc99b83aca4 100644 --- a/libcxx/test/std/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp +++ b/libcxx/test/libcxx/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/types.pass.cpp b/libcxx/test/libcxx/thread/futures/futures.task/types.pass.cpp index f7c9b223add..cb0fb803c6a 100644 --- a/libcxx/test/std/thread/futures/futures.tas/types.pass.cpp +++ b/libcxx/test/libcxx/thread/futures/futures.task/types.pass.cpp @@ -16,7 +16,9 @@ // class packaged_task<R(ArgTypes...)> // { // public: -// typedef R result_type; +// typedef R result_type; // extension + +// This is a libc++ extension. #include <future> #include <type_traits> diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_copy.fail.cpp index 9449e149027..9449e149027 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_copy.fail.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_move.pass.cpp index 3f11d670bed..3f11d670bed 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_move.pass.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor1.fail.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor1.fail.cpp index 5d53119b317..6d7d734bd5e 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor1.fail.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor1.fail.cpp @@ -15,7 +15,7 @@ // class packaged_task<R(ArgTypes...)> // template <class F> // packaged_task(F&& f); -// These constructors shall not participate in overload resolution if +// These constructors shall not participate in overload resolution if // decay<F>::type is the same type as std::packaged_task<R(ArgTypes...)>. #include <future> diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor2.fail.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp index bedff389b05..984dcdc80b3 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor2.fail.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp @@ -15,7 +15,7 @@ // class packaged_task<R(ArgTypes...)> // template <class F, class Allocator> // packaged_task(allocator_arg_t, const Allocator& a, F&& f); -// These constructors shall not participate in overload resolution if +// These constructors shall not participate in overload resolution if // decay<F>::type is the same type as std::packaged_task<R(ArgTypes...)>. #include <future> diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_copy.fail.cpp index ff07db9a2e6..ff07db9a2e6 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_copy.fail.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_default.pass.cpp index ed147d74895..ed147d74895 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_default.pass.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func.pass.cpp index 14ac7614bb8..14ac7614bb8 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func.pass.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp index 39784876b8c..39784876b8c 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_move.pass.cpp index d9951dca585..d9951dca585 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_move.pass.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/dtor.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/dtor.pass.cpp index 7fafd100564..7fafd100564 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/dtor.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/dtor.pass.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/get_future.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/get_future.pass.cpp index c8e5d6efd6b..c8e5d6efd6b 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/get_future.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/get_future.pass.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/make_ready_at_thread_exit.pass.cpp index 54ac6445824..54ac6445824 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/make_ready_at_thread_exit.pass.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/operator.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/operator.pass.cpp index 9ad1509517f..9ad1509517f 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/operator.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/operator.pass.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/reset.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/reset.pass.cpp index 02a567500ee..02a567500ee 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/reset.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/reset.pass.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/swap.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/swap.pass.cpp index eb0091c8e81..eb0091c8e81 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/swap.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/swap.pass.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/swap.pass.cpp index d90d593a75b..d90d593a75b 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/swap.pass.cpp diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.nonmembers/uses_allocator.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp index bbe75de7f8a..bbe75de7f8a 100644 --- a/libcxx/test/std/thread/futures/futures.tas/futures.task.nonmembers/uses_allocator.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp |

