diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <algorithm>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <any>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <array>
 
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
--- 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
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <bit>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <chrono>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <cmath>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <compare>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <complex>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <concepts>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <cstddef>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <deque>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <exception>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <execution>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <filesystem>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <forward_list>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <functional>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <iterator>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <limits>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <list>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <map>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <memory>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <mutex>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <new>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <numbers>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <numeric>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <optional>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <scoped_allocator>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/semaphore.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/semaphore.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/semaphore.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/semaphore.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <set>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <span>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <string>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <string_view>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/thread.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/thread.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/thread.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/thread.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <tuple>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <type_traits>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <unordered_map>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <unordered_set>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <utility>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <variant>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <vector>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
@@ -8,6 +8,8 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
+//
+// clang-format off
 
 // <version>
 
diff --git a/libcxx/utils/generate_feature_test_macro_components.py b/libcxx/utils/generate_feature_test_macro_components.py
--- a/libcxx/utils/generate_feature_test_macro_components.py
+++ b/libcxx/utils/generate_feature_test_macro_components.py
@@ -933,6 +933,8 @@
 //
 // WARNING: This test was generated by {script_name}
 // and should not be edited manually.
+//
+// clang-format off
 {markup}
 // <{header}>