diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst --- a/libcxx/docs/ReleaseNotes.rst +++ b/libcxx/docs/ReleaseNotes.rst @@ -148,7 +148,8 @@ 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 --- a/libcxx/test/configs/legacy.cfg.in +++ b/libcxx/test/configs/legacy.cfg.in @@ -62,3 +62,6 @@ 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 --- a/libcxx/utils/ci/run-buildbot +++ b/libcxx/utils/ci/run-buildbot @@ -462,7 +462,9 @@ ;; 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 --- a/libcxxabi/test/lit.site.cfg.in +++ b/libcxxabi/test/lit.site.cfg.in @@ -60,3 +60,6 @@ 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 --- a/libunwind/test/lit.site.cfg.in +++ b/libunwind/test/lit.site.cfg.in @@ -56,3 +56,6 @@ 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.")