correct script name in generated testslinaro-local/ci/tcwg_kernel/llvm-master-arm-lts-allyesconfig

43 files changed, 91 insertions, 89 deletions

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
index 860cbab09bd..36f82c0b75e 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 8e8174323cc..dbd27c14b47 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 75c2785815c..9d746ece921 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 4ba37542c9e..835e48d0e7d 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // 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
index c3e6a56c604..97d2b9246bd 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index f777fff8868..3605878c55b 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 02c7c00a583..13d6b9312d5 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index e2d8ab88b9e..c1dff02d24e 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 889aea0fcef..170a3da8947 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <complex>
 
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
index 55a16288b77..f4ebc8e10af 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 94cb8290b72..a325d6a3a2a 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 25a7c385209..97ce6d330d5 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <exception>
 
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
index 9bd9f08fc40..990e5683b4b 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 41e4b774928..5bf0213078d 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 4958d4d4cd2..5ca84c1cc5a 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <functional>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/generate_feature_test_macro_components.py b/libcxx/test/std/language.support/support.limits/support.limits.general/generate_feature_test_macro_components.py
index 2f13ed022a2..c80ebb11e67 100755
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/generate_feature_test_macro_components.py
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/generate_feature_test_macro_components.py
@@ -5,6 +5,7 @@ import tempfile
 
 def get_libcxx_paths():
   script_path = os.path.dirname(os.path.abspath(__file__))
+  script_name = os.path.basename(__file__)
   assert os.path.exists(script_path)
   depth = 5
   src_root = script_path
@@ -14,10 +15,10 @@ def get_libcxx_paths():
   assert os.path.exists(include_path)
   docs_path = os.path.join(src_root, 'docs')
   assert os.path.exists(docs_path)
-  return script_path, src_root, include_path, docs_path
+  return script_path, script_name, src_root, include_path, docs_path
 
 
-script_path, source_root, include_path, docs_path = get_libcxx_paths()
+script_path, script_name, source_root, include_path, docs_path = get_libcxx_paths()
 
 def has_header(h):
   h_path = os.path.join(include_path, h)
@@ -835,8 +836,8 @@ def produce_tests():
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by {script_name}
+// and should not be edited manually.
 {test_tags}
 // <{header}>
 
@@ -866,7 +867,8 @@ def produce_tests():
 #endif // TEST_STD_VER > 17
 
 int main() {{}}
-""".format(header=h,
+""".format(script_name=script_name,
+           header=h,
            test_tags=test_tags,
            synopsis=generate_synopsis(test_list),
            cxx11_tests=generate_std_test(test_list, 'c++11').strip(),
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
index f82e5ba046f..ef2e058265c 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <iomanip>
 
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
index 195ca2d0b00..77eec86cf7c 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <istream>
 
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
index 7113bd3ae64..7312c4de7b8 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <iterator>
 
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
index 91f0d7cedc7..e63df4ff523 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 12e683f263f..cf087259fc8 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index e77aa71068a..352d7363725 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <locale>
 
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
index 31ef16061d1..a98bc28c89c 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 4780a1f7070..1d8cb9005e4 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index e572d5796d7..04edd597b45 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index beddc601011..e2dd9b77433 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <new>
 
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
index 39bab221cf7..83b6207654f 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index c7db36f685c..4c9fecd2113 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 72417122020..1bcf8d55d48 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <ostream>
 
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
index 9869e209b7c..cd07ac06828 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <regex>
 
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
index 171fe5e3256..4c2f35af95f 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <scoped_allocator>
 
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
index 95af65c1fc0..7a4cabde853 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 98bdf704bd0..493411ffdde 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // UNSUPPORTED: libcpp-has-no-threads
 
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
index dd6d09e24a6..8639c468cc3 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index c8ceb7c7e7b..44e97f3af80 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <string_view>
 
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
index 6e680a774e8..6466a2f6458 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 1a82290274a..49113a3d043 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 75ce435dd88..9aa06e4db08 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index c08a8fbd749..3153afd254c 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index e24e0a38b78..94bdb824a5d 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index b822eb74fe2..d4ef3d7e0fc 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 6ba328d5c69..5cdeca06b5d 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <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
index 27931b447fb..5fa996967c0 100644
--- 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
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// WARNING: This test was generated by generate_feature_test_macros_tests.py and
-// should not be edited manually.
+// WARNING: This test was generated by generate_feature_test_macro_components.py
+// and should not be edited manually.
 
 // <version>