[libcxx] Improve tests to use the UNSUPPORTED lit directive

Quite a few libcxx tests seem to follow the format:
 #if _LIBCPP_STD_VER > X
   // Do test.
 #else
   // Empty test.
 #endif
We should instead use the UNSUPPORTED lit directive to exclude the test on
earlier C++ standards. This gives us a more accurate number of test passes
for those standards and avoids unnecessary conflicts with other lit
directives on the same tests.

Reviewers: bcraig, ericwf, mclow.lists

Differential revision: http://reviews.llvm.org/D20730

llvm-svn: 271108

5 files changed, 8 insertions, 14 deletions

diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals.pass.cpp
index 48324ae8365..d9af1074ca3 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals.pass.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+// UNSUPPORTED: c++98, c++03, c++11
 // <chrono>
 
 #include <chrono>
@@ -15,7 +16,6 @@
 
 int main()
 {
-#if _LIBCPP_STD_VER > 11 
     using namespace std::literals::chrono_literals;
 
 //    Make sure the types are right
@@ -55,5 +55,4 @@ int main()
     assert ( ns == std::chrono::nanoseconds(645));
     auto ns2 = 645.ns;
     assert ( ns == ns2 );
-#endif
 }
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.fail.cpp
index 46aaa30e51e..52208cb54d6 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.fail.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.fail.cpp
@@ -7,15 +7,13 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++98, c++03, c++11
 #include <chrono>
 #include <cassert>
 
 int main()
 {
-#if _LIBCPP_STD_VER > 11 
     std::chrono::hours h  = 4h;  // should fail w/conversion operator not found
-#else
-#error
-#endif
 }
 
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp
index 574f9bcce87..a2821591e40 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp
@@ -7,12 +7,13 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++98, c++03, c++11
 #include <chrono>
 #include <cassert>
 
 int main()
 {
-#if _LIBCPP_STD_VER > 11 
     using namespace std::chrono;
 
     hours h = 4h;
@@ -44,5 +45,4 @@ int main()
     assert ( ns == nanoseconds(645));
     auto ns2 = 645.ns;
     assert ( ns == ns2 );
-#endif
 }
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.fail.cpp
index 17358e589f4..f190d786306 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.fail.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.fail.cpp
@@ -7,16 +7,14 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++98, c++03, c++11
 #include <chrono>
 #include <cassert>
 
 int main()
 {
-#if _LIBCPP_STD_VER > 11 
     using std::chrono::hours;
 
     hours foo  =  4h;  // should fail w/conversion operator not found
-#else
-#error
-#endif
 }
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp
index e37bc6e6796..327c26fbf6a 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+// UNSUPPORTED: c++98, c++03, c++11
 // <chrono>
 
 #include <chrono>
@@ -15,7 +16,6 @@
 
 int main()
 {
-#if _LIBCPP_STD_VER > 11 
     using namespace std::literals;
 
     std::chrono::hours h = 4h;
@@ -47,5 +47,4 @@ int main()
     assert ( ns == std::chrono::nanoseconds(645));
     auto ns2 = 645.ns;
     assert ( ns == ns2 );
-#endif
 }