Index: test/std/strings/basic.string/string.access/back.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.access/back.pass.cpp
+++ test/std/strings/basic.string/string.access/back.pass.cpp
@@ -18,6 +18,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.access/db_back.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.access/db_back.pass.cpp
+++ test/std/strings/basic.string/string.access/db_back.pass.cpp
@@ -20,6 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.access/db_cback.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.access/db_cback.pass.cpp
+++ test/std/strings/basic.string/string.access/db_cback.pass.cpp
@@ -20,6 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.access/db_cfront.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.access/db_cfront.pass.cpp
+++ test/std/strings/basic.string/string.access/db_cfront.pass.cpp
@@ -20,6 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.access/db_cindex.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.access/db_cindex.pass.cpp
+++ test/std/strings/basic.string/string.access/db_cindex.pass.cpp
@@ -20,6 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.access/db_front.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.access/db_front.pass.cpp
+++ test/std/strings/basic.string/string.access/db_front.pass.cpp
@@ -20,6 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.access/db_index.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.access/db_index.pass.cpp
+++ test/std/strings/basic.string/string.access/db_index.pass.cpp
@@ -20,6 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.access/front.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.access/front.pass.cpp
+++ test/std/strings/basic.string/string.access/front.pass.cpp
@@ -18,6 +18,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.access/index.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.access/index.pass.cpp
+++ test/std/strings/basic.string/string.access/index.pass.cpp
@@ -18,6 +18,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.capacity/clear.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.capacity/clear.pass.cpp
+++ test/std/strings/basic.string/string.capacity/clear.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.capacity/length.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.capacity/length.pass.cpp
+++ test/std/strings/basic.string/string.capacity/length.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.capacity/max_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.capacity/max_size.pass.cpp
+++ test/std/strings/basic.string/string.capacity/max_size.pass.cpp
@@ -21,6 +21,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp
+++ test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp
@@ -21,6 +21,7 @@
 #include <cassert>
 #include <stdexcept>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.capacity/size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.capacity/size.pass.cpp
+++ test/std/strings/basic.string/string.capacity/size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.iterators/begin.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/begin.pass.cpp
+++ test/std/strings/basic.string/string.iterators/begin.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.iterators/cbegin.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/cbegin.pass.cpp
+++ test/std/strings/basic.string/string.iterators/cbegin.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.iterators/cend.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/cend.pass.cpp
+++ test/std/strings/basic.string/string.iterators/cend.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.iterators/crbegin.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/crbegin.pass.cpp
+++ test/std/strings/basic.string/string.iterators/crbegin.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.iterators/crend.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/crend.pass.cpp
+++ test/std/strings/basic.string/string.iterators/crend.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
+++ test/std/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
@@ -20,6 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
+++ test/std/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
@@ -20,6 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
+++ test/std/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
@@ -20,6 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
+++ test/std/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
@@ -20,6 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
+++ test/std/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
@@ -20,6 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
+++ test/std/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
@@ -20,6 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
+++ test/std/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
@@ -20,6 +20,7 @@
 #include <exception>
 #include <cstdlib>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.iterators/end.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/end.pass.cpp
+++ test/std/strings/basic.string/string.iterators/end.pass.cpp
@@ -15,6 +15,7 @@
 #include <cassert>
 #include <cstddef>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.iterators/rbegin.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/rbegin.pass.cpp
+++ test/std/strings/basic.string/string.iterators/rbegin.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.iterators/rend.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.iterators/rend.pass.cpp
+++ test/std/strings/basic.string/string.iterators/rend.pass.cpp
@@ -15,6 +15,7 @@
 #include <cassert>
 #include <cstddef>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
+++ test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 #include "min_allocator.h"
 
Index: test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
+++ test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
@@ -18,6 +18,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 #include "min_allocator.h"
 
Index: test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
+++ test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
@@ -16,6 +16,7 @@
 #include <iterator>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 #include "test_iterators.h"
 
Index: test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
+++ test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp
@@ -17,6 +17,7 @@
 #include <sstream>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int main(int, char**)
Index: test/std/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp
@@ -15,6 +15,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_op!=/string_string_view.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_op!=/string_string_view.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_op!=/string_string_view.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.nonmembers/string_op!=/string_view_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_op!=/string_view_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_op!=/string_view_string.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
@@ -15,6 +15,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_operator==/string_string_view.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_operator==/string_string_view.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_operator==/string_string_view.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.nonmembers/string_operator==/string_view_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_operator==/string_view_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_operator==/string_view_string.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
@@ -15,6 +15,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_opgt/string_string_view.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_opgt/string_string_view.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_opgt/string_string_view.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.nonmembers/string_opgt/string_view_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_opgt/string_view_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_opgt/string_view_string.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
@@ -15,6 +15,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string_view.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string_view.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string_view.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.nonmembers/string_opgt=/string_view_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_opgt=/string_view_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_opgt=/string_view_string.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
@@ -15,6 +15,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_oplt/string_string_view.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_oplt/string_string_view.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_oplt/string_string_view.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.nonmembers/string_oplt/string_view_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_oplt/string_view_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_oplt/string_view_string.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
@@ -14,6 +14,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
@@ -15,6 +15,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string_view.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string_view.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string_view.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.nonmembers/string_oplt=/string_view_string.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.nonmembers/string_oplt=/string_view_string.pass.cpp
+++ test/std/strings/basic.string/string.nonmembers/string_oplt=/string_view_string.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
+++ test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
+++ test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_allocator.h"
 #include "min_allocator.h"
 
Index: test/std/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int sign(int x)
Index: test/std/strings/basic.string/string.ops/string_compare/string_view.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_compare/string_view.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_compare/string_view.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 int sign(int x)
Index: test/std/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find.first.not.of/string_view_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.first.not.of/string_view_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.first.not.of/string_view_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find.first.of/string_view_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.first.of/string_view_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.first.of/string_view_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find.last.not.of/string_view_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.last.not.of/string_view_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.last.not.of/string_view_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find.last.of/string_view_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find.last.of/string_view_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find.last.of/string_view_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.ops/string_find/char_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find/char_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find/char_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_find/string_view_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_find/string_view_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_find/string_view_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
Index: test/std/strings/basic.string/string.ops/string_rfind/string_view_size.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.ops/string_rfind/string_view_size.pass.cpp
+++ test/std/strings/basic.string/string.ops/string_rfind/string_view_size.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S, class SV>
Index: test/std/strings/basic.string/string.require/contiguous.pass.cpp
===================================================================
--- test/std/strings/basic.string/string.require/contiguous.pass.cpp
+++ test/std/strings/basic.string/string.require/contiguous.pass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_allocator.h"
 #include "min_allocator.h"
 
Index: test/std/strings/basic.string/types.pass.cpp
===================================================================
--- test/std/strings/basic.string/types.pass.cpp
+++ test/std/strings/basic.string/types.pass.cpp
@@ -35,6 +35,7 @@
 #include <iterator>
 #include <type_traits>
 
+#include "test_macros.h"
 #include "test_traits.h"
 #include "test_allocator.h"
 #include "min_allocator.h"