From 20544746402a94fece90dd2500cdaf62320310cc Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2@gmail.com>
Date: Sat, 8 May 2021 12:15:30 -0400
Subject: [PATCH] [libc++] NFC: Refactor Lit annotations

Annotations for c++03 mode are useless, since we only run these tests
in C++11 and C++14.
---
 .../futures.task.members/ctor_func_alloc.pass.cpp        |  4 ++--
 ...llocator.pass.cpp => uses_allocator.compile.pass.cpp} | 16 +++-------------
 2 files changed, 5 insertions(+), 15 deletions(-)
 rename libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/{uses_allocator.pass.cpp => uses_allocator.compile.pass.cpp} (64%)

diff --git a/libcxx/test/std/thread/futures/futures.task/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 2c9046d..2255a45 100644
--- a/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp
@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 //
 // UNSUPPORTED: libcpp-has-no-threads
-// UNSUPPORTED: c++03
-// REQUIRES: c++11 || c++14
+
 // packaged_task allocator support was removed in C++17 (LWG 2921)
+// REQUIRES: c++11 || c++14
 
 // <future>
 
diff --git a/libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.compile.pass.cpp
similarity index 64%
rename from libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp
rename to libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.compile.pass.cpp
index 7905a58..ce55773 100644
--- a/libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.compile.pass.cpp
@@ -8,15 +8,10 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 
-// This test is marked XFAIL and not UNSUPPORTED because the non-variadic
-// declaration of packaged_task is available in C++03. Therefore the test
-// should fail because the static_assert fires and not because std::packaged_task
-// in undefined.
-// XFAIL: c++03
+// packaged_task allocator support was removed in C++17 (LWG 2976)
+// REQUIRES: c++11 || c++14
 
 // <future>
-// REQUIRES: c++11 || c++14
-// packaged_task allocator support was removed in C++17 (LWG 2976)
 
 // class packaged_task<R(ArgTypes...)>
 
@@ -28,9 +23,4 @@
 #include "test_macros.h"
 #include "test_allocator.h"
 
-int main(int, char**)
-{
-    static_assert((std::uses_allocator<std::packaged_task<double(int, char)>, test_allocator<int> >::value), "");
-
-  return 0;
-}
+static_assert((std::uses_allocator<std::packaged_task<double(int, char)>, test_allocator<int> >::value), "");
-- 
2.7.4