From 719bf2d9d9fdb8792b15d93364c9c6b2ddd68a36 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2@gmail.com>
Date: Thu, 26 May 2022 11:12:45 -0400
Subject: [PATCH] [runtimes] Officially deprecate the legacy testing
 configuration system

Add a warning and tweak the release note to explain that the deprecation
targets libc++, libc++abi and libuwnind as well.

Also, as a fly-by, ensure that our CI runs the legacy testing configuration
for libc++, libc++abi and libunwind. This doesn't matter too much since
it's deprecated, but we might as well test it properly.

Differential Revision: https://reviews.llvm.org/D126478
---
 libcxx/docs/ReleaseNotes.rst      | 9 +++++----
 libcxx/test/configs/legacy.cfg.in | 3 +++
 libcxx/utils/ci/run-buildbot      | 4 +++-
 libcxxabi/test/lit.site.cfg.in    | 3 +++
 libunwind/test/lit.site.cfg.in    | 3 +++
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst
index 514de5d..b2bd071 100644
--- a/libcxx/docs/ReleaseNotes.rst
+++ b/libcxx/docs/ReleaseNotes.rst
@@ -148,7 +148,8 @@ Build System Changes
   its own headers.
 
 - The legacy testing configuration is now deprecated and will be removed in the next release. For
-  most users, this should not have any impact. However, if you are testing libc++ in a configuration
-  or on a platform that used to be supported by the legacy testing configuration and isn't supported
-  by one of the configurations in ``libcxx/test/configs``, please reach out to the libc++ developers
-  to get your configuration supported officially.
+  most users, this should not have any impact. However, if you are testing libc++, libc++abi or
+  libunwind in a configuration or on a platform that used to be supported by the legacy testing
+  configuration and isn't supported by one of the configurations in ``libcxx/test/configs``,
+  ``libcxxabi/test/configs`` or ``libunwind/test/configs``, please move to one of those
+  configurations or define your own.
diff --git a/libcxx/test/configs/legacy.cfg.in b/libcxx/test/configs/legacy.cfg.in
index 8bb5bc7..a7ac6f8 100644
--- a/libcxx/test/configs/legacy.cfg.in
+++ b/libcxx/test/configs/legacy.cfg.in
@@ -62,3 +62,6 @@ import libcxx.test.config
 configuration = libcxx.test.config.Configuration(lit_config, config)
 configuration.configure()
 configuration.print_config_info()
+
+lit_config.warning("This is a legacy testing configuration which will be removed in LLVM 16. "
+                   "Please use one of the configurations in libcxx/test/configs or define your own.")
diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
index 23708e6..2b9f129 100755
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -462,7 +462,9 @@ bootstrapping-build)
 ;;
 legacy-test-config)
     clean
-    generate-cmake -DLIBCXX_TEST_CONFIG="legacy.cfg.in"
+    generate-cmake -DLIBCXX_TEST_CONFIG="legacy.cfg.in" \
+                   -DLIBCXXABI_TEST_CONFIG="${MONOREPO_ROOT}/libcxxabi/test/lit.site.cfg.in" \
+                   -DLIBUNWIND_TEST_CONFIG="${MONOREPO_ROOT}/libunwind/test/lit.site.cfg.in"
     check-runtimes
 ;;
 legacy-project-build)
diff --git a/libcxxabi/test/lit.site.cfg.in b/libcxxabi/test/lit.site.cfg.in
index ae387f5..7a786a3 100644
--- a/libcxxabi/test/lit.site.cfg.in
+++ b/libcxxabi/test/lit.site.cfg.in
@@ -60,3 +60,6 @@ import libcxxabi.test.config
 configuration = libcxxabi.test.config.Configuration(lit_config, config)
 configuration.configure()
 configuration.print_config_info()
+
+lit_config.warning("This is a legacy testing configuration which will be removed in LLVM 16. "
+                   "Please use one of the configurations in libcxxabi/test/configs or define your own.")
diff --git a/libunwind/test/lit.site.cfg.in b/libunwind/test/lit.site.cfg.in
index 9fb3240..3153093 100644
--- a/libunwind/test/lit.site.cfg.in
+++ b/libunwind/test/lit.site.cfg.in
@@ -56,3 +56,6 @@ import libunwind.test.config
 configuration = libunwind.test.config.Configuration(lit_config, config)
 configuration.configure()
 configuration.print_config_info()
+
+lit_config.warning("This is a legacy testing configuration which will be removed in LLVM 16. "
+                   "Please use one of the configurations in libunwind/test/configs or define your own.")
-- 
2.7.4