summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/atomics
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/std/atomics')
-rw-r--r--libcxx/test/std/atomics/atomics.fences/atomic_signal_fence.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.fences/atomic_thread_fence.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.flag/atomic_flag_clear.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.flag/atomic_flag_test_and_set.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.flag/atomic_flag_test_and_set_explicit.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.flag/clear.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.flag/init.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.flag/test_and_set.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.general/replace_failure_order.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.lockfree/lockfree.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.order/kill_dependency.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.order/memory_order.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.order/memory_order_new.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.types.generic/integral_typedefs.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.types.generic/trivially_copyable.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_is_lock_free.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp1
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp2
-rw-r--r--libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/ctor.pass.cpp1
42 files changed, 61 insertions, 0 deletions
diff --git a/libcxx/test/std/atomics/atomics.fences/atomic_signal_fence.pass.cpp b/libcxx/test/std/atomics/atomics.fences/atomic_signal_fence.pass.cpp
index bf5325940e4..323d77d7ace 100644
--- a/libcxx/test/std/atomics/atomics.fences/atomic_signal_fence.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.fences/atomic_signal_fence.pass.cpp
@@ -14,6 +14,8 @@
#include <atomic>
+#include "test_macros.h"
+
int main(int, char**)
{
std::atomic_signal_fence(std::memory_order_seq_cst);
diff --git a/libcxx/test/std/atomics/atomics.fences/atomic_thread_fence.pass.cpp b/libcxx/test/std/atomics/atomics.fences/atomic_thread_fence.pass.cpp
index d237f2de118..ab376868eeb 100644
--- a/libcxx/test/std/atomics/atomics.fences/atomic_thread_fence.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.fences/atomic_thread_fence.pass.cpp
@@ -14,6 +14,8 @@
#include <atomic>
+#include "test_macros.h"
+
int main(int, char**)
{
std::atomic_thread_fence(std::memory_order_seq_cst);
diff --git a/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear.pass.cpp b/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear.pass.cpp
index 23cb3d2b6fa..f89d77a479a 100644
--- a/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear.pass.cpp
@@ -18,6 +18,8 @@
#include <atomic>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp b/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp
index d87291297ee..53f50ab59cf 100644
--- a/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp
@@ -18,6 +18,8 @@
#include <atomic>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/atomics/atomics.flag/atomic_flag_test_and_set.pass.cpp b/libcxx/test/std/atomics/atomics.flag/atomic_flag_test_and_set.pass.cpp
index d73dc316d96..22e4b66d45c 100644
--- a/libcxx/test/std/atomics/atomics.flag/atomic_flag_test_and_set.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.flag/atomic_flag_test_and_set.pass.cpp
@@ -18,6 +18,8 @@
#include <atomic>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/atomics/atomics.flag/atomic_flag_test_and_set_explicit.pass.cpp b/libcxx/test/std/atomics/atomics.flag/atomic_flag_test_and_set_explicit.pass.cpp
index 972a6e84b6f..9c1c222ed94 100644
--- a/libcxx/test/std/atomics/atomics.flag/atomic_flag_test_and_set_explicit.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.flag/atomic_flag_test_and_set_explicit.pass.cpp
@@ -18,6 +18,8 @@
#include <atomic>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/atomics/atomics.flag/clear.pass.cpp b/libcxx/test/std/atomics/atomics.flag/clear.pass.cpp
index 33378e4bd87..676cfc5ff62 100644
--- a/libcxx/test/std/atomics/atomics.flag/clear.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.flag/clear.pass.cpp
@@ -18,6 +18,8 @@
#include <atomic>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/atomics/atomics.flag/init.pass.cpp b/libcxx/test/std/atomics/atomics.flag/init.pass.cpp
index a45784d802b..52cffea34f7 100644
--- a/libcxx/test/std/atomics/atomics.flag/init.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.flag/init.pass.cpp
@@ -18,6 +18,8 @@
#include <atomic>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::atomic_flag f = ATOMIC_FLAG_INIT;
diff --git a/libcxx/test/std/atomics/atomics.flag/test_and_set.pass.cpp b/libcxx/test/std/atomics/atomics.flag/test_and_set.pass.cpp
index 1a198c1be84..393c4627368 100644
--- a/libcxx/test/std/atomics/atomics.flag/test_and_set.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.flag/test_and_set.pass.cpp
@@ -18,6 +18,8 @@
#include <atomic>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/atomics/atomics.general/replace_failure_order.pass.cpp b/libcxx/test/std/atomics/atomics.general/replace_failure_order.pass.cpp
index ee23841382b..631f97a0582 100644
--- a/libcxx/test/std/atomics/atomics.general/replace_failure_order.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.general/replace_failure_order.pass.cpp
@@ -23,6 +23,8 @@
#include <atomic>
+#include "test_macros.h"
+
int main(int, char**) {
std::atomic<int> i;
volatile std::atomic<int> v;
diff --git a/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp b/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
index 523f477cad4..a53eb741eae 100644
--- a/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp
@@ -15,6 +15,8 @@
#include <atomic>
#include <cassert>
+#include "test_macros.h"
+
#if !defined(__cpp_lib_atomic_is_always_lock_free)
# error Feature test macro missing.
#endif
diff --git a/libcxx/test/std/atomics/atomics.lockfree/lockfree.pass.cpp b/libcxx/test/std/atomics/atomics.lockfree/lockfree.pass.cpp
index b86893e0b9c..064afcaa7ed 100644
--- a/libcxx/test/std/atomics/atomics.lockfree/lockfree.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.lockfree/lockfree.pass.cpp
@@ -24,6 +24,8 @@
#include <atomic>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
assert(ATOMIC_BOOL_LOCK_FREE == 0 ||
diff --git a/libcxx/test/std/atomics/atomics.order/kill_dependency.pass.cpp b/libcxx/test/std/atomics/atomics.order/kill_dependency.pass.cpp
index 998b0cef38b..7cad751841e 100644
--- a/libcxx/test/std/atomics/atomics.order/kill_dependency.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.order/kill_dependency.pass.cpp
@@ -15,6 +15,8 @@
#include <atomic>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
assert(std::kill_dependency(5) == 5);
diff --git a/libcxx/test/std/atomics/atomics.order/memory_order.pass.cpp b/libcxx/test/std/atomics/atomics.order/memory_order.pass.cpp
index c756d0b187b..8e35cf19500 100644
--- a/libcxx/test/std/atomics/atomics.order/memory_order.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.order/memory_order.pass.cpp
@@ -19,6 +19,8 @@
#include <atomic>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
assert(static_cast<int>(std::memory_order_relaxed) == 0);
diff --git a/libcxx/test/std/atomics/atomics.order/memory_order_new.pass.cpp b/libcxx/test/std/atomics/atomics.order/memory_order_new.pass.cpp
index e9a571dfa8b..771803a428c 100644
--- a/libcxx/test/std/atomics/atomics.order/memory_order_new.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.order/memory_order_new.pass.cpp
@@ -10,6 +10,8 @@
#include <atomic>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert(std::memory_order_relaxed == std::memory_order::relaxed);
diff --git a/libcxx/test/std/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp b/libcxx/test/std/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp
index a0648ff9c0a..139b0524a82 100644
--- a/libcxx/test/std/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp
@@ -39,6 +39,8 @@
#include <type_traits>
#include <cstdint>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert((std::is_same<std::atomic< std::int_least8_t>, std::atomic_int_least8_t>::value), "");
diff --git a/libcxx/test/std/atomics/atomics.types.generic/integral_typedefs.pass.cpp b/libcxx/test/std/atomics/atomics.types.generic/integral_typedefs.pass.cpp
index faa682b8cef..dd59c301a8e 100644
--- a/libcxx/test/std/atomics/atomics.types.generic/integral_typedefs.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.generic/integral_typedefs.pass.cpp
@@ -40,6 +40,8 @@
#include <atomic>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert((std::is_same<std::atomic<char>, std::atomic_char>::value), "");
diff --git a/libcxx/test/std/atomics/atomics.types.generic/trivially_copyable.pass.cpp b/libcxx/test/std/atomics/atomics.types.generic/trivially_copyable.pass.cpp
index 229761eb326..5e2c46c4f95 100644
--- a/libcxx/test/std/atomics/atomics.types.generic/trivially_copyable.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.generic/trivially_copyable.pass.cpp
@@ -58,6 +58,8 @@
#include <thread> // for thread_id
#include <chrono> // for nanoseconds
+#include "test_macros.h"
+
struct TriviallyCopyable {
TriviallyCopyable ( int i ) : i_(i) {}
int i_;
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
index 041845d5be2..0c748785846 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
@@ -23,6 +23,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
index 99a85088633..e94f191e953 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
@@ -26,6 +26,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
index a2a9e205db8..5379f776fa2 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
@@ -24,6 +24,7 @@
#include <cassert>
#include <cmpxchg_loop.h>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
index 2ad17f1cbe6..8a8a6d61e63 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
@@ -28,6 +28,7 @@
#include <cmpxchg_loop.h>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp
index d13238e6528..9fd9e0a6f50 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp
@@ -23,6 +23,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp
index 2acbcb20f7c..3e75c60b49a 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp
@@ -23,6 +23,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp
index f84a4898348..e584ea955d7 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp
@@ -31,6 +31,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp
index fbdf3fffcd7..548101a409e 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp
@@ -31,6 +31,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp
index dfaaaa3e5b4..aad3209e4fa 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp
@@ -22,6 +22,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp
index d31245a8421..cbcc2231d0f 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp
@@ -22,6 +22,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp
index 741dca00e86..f86624a977c 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp
@@ -22,6 +22,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp
index e56e946f43c..12686835aa2 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp
@@ -22,6 +22,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp
index 13fde4ad6a7..20ec7688bb2 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp
@@ -31,6 +31,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp
index af97bcc6022..f26cefcbdb0 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp
@@ -32,6 +32,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp
index 0e6f99f3629..4979e0106ff 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp
@@ -22,6 +22,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp
index ece15694561..639cc230f82 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp
@@ -22,6 +22,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp
index 0e5b920f91e..285e1af2ce0 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp
@@ -23,6 +23,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_is_lock_free.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_is_lock_free.pass.cpp
index bfa24dae562..9ca2207ba85 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_is_lock_free.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_is_lock_free.pass.cpp
@@ -21,6 +21,7 @@
#include <atomic>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp
index b775c546737..da0b955d4a8 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp
@@ -23,6 +23,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp
index 0384baa5a7f..350e3bd2cec 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp
@@ -23,6 +23,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp
index 0fb3bc7dda9..62d67586db1 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp
@@ -22,6 +22,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp
index 11aa295dee4..dd70963df29 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp
@@ -22,6 +22,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
template <class T>
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp
index 1588af3273f..6861dd65399 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp
@@ -17,6 +17,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::atomic<int> v = ATOMIC_VAR_INIT(5);
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/ctor.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/ctor.pass.cpp
index d692e931b49..f5506a0aeac 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/ctor.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/ctor.pass.cpp
@@ -21,6 +21,7 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
#include "atomic_helpers.h"
struct UserType {
OpenPOWER on IntegriCloud