1 files changed, 90 insertions, 37 deletions
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
index 78ee09d2f7f..4c0b351213a 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
@@ -1,4 +1,3 @@
-
 //===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
@@ -8,48 +7,102 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// <atomic> feature macros
+// WARNING: This test was generated by generate_feature_test_macros_tests.py and
+// should not be edited manually.
 
-/*  Constant                                    Value
-    __cpp_lib_char8_t                           201811L
-    __cpp_lib_atomic_is_always_lock_free        201603L
-    __cpp_lib_atomic_ref                        201806L
+// <atomic>
 
-*/
+// Test the feature test macros defined by <atomic>
 
-// UNSUPPORTED: libcpp-has-no-threads
+/*  Constant                                Value
+    __cpp_lib_atomic_is_always_lock_free    201603L [C++17]
+    __cpp_lib_atomic_ref                    201806L [C++2a]
+    __cpp_lib_char8_t                       201811L [C++2a]
+*/
 
 #include <atomic>
-#include <cassert>
 #include "test_macros.h"
 
-int main()
-{
-//  ensure that the macros that are supposed to be defined in <atomic> are defined.
+#if TEST_STD_VER < 14
+
+# ifdef __cpp_lib_atomic_is_always_lock_free
+#   error "__cpp_lib_atomic_is_always_lock_free should not be defined before c++17"
+# endif
+
+# ifdef __cpp_lib_atomic_ref
+#   error "__cpp_lib_atomic_ref should not be defined before c++2a"
+# endif
+
+# ifdef __cpp_lib_char8_t
+#   error "__cpp_lib_char8_t should not be defined before c++2a"
+# endif
+
+#elif TEST_STD_VER == 14
+
+# ifdef __cpp_lib_atomic_is_always_lock_free
+#   error "__cpp_lib_atomic_is_always_lock_free should not be defined before c++17"
+# endif
+
+# ifdef __cpp_lib_atomic_ref
+#   error "__cpp_lib_atomic_ref should not be defined before c++2a"
+# endif
+
+# ifdef __cpp_lib_char8_t
+#   error "__cpp_lib_char8_t should not be defined before c++2a"
+# endif
+
+#elif TEST_STD_VER == 17
 
-#if TEST_STD_VER > 17 && defined(__cpp_char8_t)
-# if !defined(__cpp_lib_char8_t)  
-  LIBCPP_STATIC_ASSERT(false, "__cpp_lib_char8_t is not defined");
+# ifndef __cpp_lib_atomic_is_always_lock_free
+#   error "__cpp_lib_atomic_is_always_lock_free should be defined in c++17"
+# endif
+# if __cpp_lib_atomic_is_always_lock_free != 201603L
+#   error "__cpp_lib_atomic_is_always_lock_free should have the value 201603L in c++17"
+# endif
+
+# ifdef __cpp_lib_atomic_ref
+#   error "__cpp_lib_atomic_ref should not be defined before c++2a"
+# endif
+
+# ifdef __cpp_lib_char8_t
+#   error "__cpp_lib_char8_t should not be defined before c++2a"
+# endif
+
+#elif TEST_STD_VER > 17
+
+# ifndef __cpp_lib_atomic_is_always_lock_free
+#   error "__cpp_lib_atomic_is_always_lock_free should be defined in c++2a"
+# endif
+# if __cpp_lib_atomic_is_always_lock_free != 201603L
+#   error "__cpp_lib_atomic_is_always_lock_free should have the value 201603L in c++2a"
+# endif
+
+# if !defined(_LIBCPP_VERSION)
+#   ifndef __cpp_lib_atomic_ref
+#     error "__cpp_lib_atomic_ref should be defined in c++2a"
+#   endif
+#   if __cpp_lib_atomic_ref != 201806L
+#     error "__cpp_lib_atomic_ref should have the value 201806L in c++2a"
+#   endif
+# else // _LIBCPP_VERSION
+#   ifdef __cpp_lib_atomic_ref
+#     error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!"
+#   endif
+# endif
+
+# if defined(__cpp_char8_t)
+#   ifndef __cpp_lib_char8_t
+#     error "__cpp_lib_char8_t should be defined in c++2a"
+#   endif
+#   if __cpp_lib_char8_t != 201811L
+#     error "__cpp_lib_char8_t should have the value 201811L in c++2a"
+#   endif
 # else
-#  if __cpp_lib_char8_t < 201811L
-#   error "__cpp_lib_char8_t has an invalid value"
-#  endif
-# endif
-#endif
-
-#if TEST_STD_VER > 14
-# if !defined(__cpp_lib_atomic_is_always_lock_free)
-#  error "__cpp_lib_atomic_is_always_lock_free is not defined"
-# elif __cpp_lib_atomic_is_always_lock_free < 201603L
-#  error "__cpp_lib_atomic_is_always_lock_free has an invalid value"
-# endif
-#endif
-
-/*
-#if !defined(__cpp_lib_fooby)
-# error "__cpp_lib_fooby is not defined"
-#elif __cpp_lib_fooby < 201606L
-# error "__cpp_lib_fooby has an invalid value"
-#endif
-*/
-}
+#   ifdef __cpp_lib_char8_t
+#     error "__cpp_lib_char8_t should not be defined when defined(__cpp_char8_t) is not defined!"
+#   endif
+# endif
+
+#endif // TEST_STD_VER > 17
+
+int main() {}