[PATCH] D134650: [runtimes] Remove all traces of the legacy testing configuration system
arichardson added a comment. In case anyone else runs into this: It appears this change somehow broke incremental builds with `-DLLVM_ENABLE_RUNTIMES=libunwind` (even after deleting CMakeCache.txt in the main build dir): -- Using libunwind testing configuration: /home/alexrichardson/cheri/upstream-llvm-project/libunwind/test/lit.site.cfg.in CMake Error: File /home/alexrichardson/cheri/upstream-llvm-project/libunwind/test/lit.site.cfg.in does not exist. CMake Error at /home/alexrichardson/cheri/upstream-llvm-project/llvm/cmake/modules/AddLLVM.cmake:1793 (configure_file): configure_file Problem configuring file Call Stack (most recent call first): /home/alexrichardson/cheri/upstream-llvm-project/libunwind/test/CMakeLists.txt:45 (configure_lit_site_cfg) -- Configuring incomplete, errors occurred! Fortunately this is quite easy to fix: `rm -rf /runtimes` and then run `ninja` again. I'm not sure if this would help (and I don't have a broken build dir anymore), but it might be possible to avoid this problem by touching CMakeLists.txt in llvm/runtimes? Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D134650/new/ https://reviews.llvm.org/D134650 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D134650: [runtimes] Remove all traces of the legacy testing configuration system
This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rGa48f018bb7d8: [runtimes] Remove all traces of the legacy testing configuration system (authored by ldionne). Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D134650/new/ https://reviews.llvm.org/D134650 Files: clang/cmake/caches/CrossWinToARMLinux.cmake libcxx/cmake/caches/MinGW.cmake libcxx/docs/BuildingLibcxx.rst libcxx/docs/ReleaseNotes.rst libcxx/test/CMakeLists.txt libcxx/test/configs/legacy.cfg.in libcxx/utils/ci/buildkite-pipeline.yml libcxx/utils/ci/run-buildbot libcxx/utils/libcxx/compiler.py libcxx/utils/libcxx/test/config.py libcxx/utils/libcxx/test/target_info.py libcxx/utils/libcxx/util.py libcxxabi/test/CMakeLists.txt libcxxabi/test/libcxxabi/__init__.py libcxxabi/test/libcxxabi/test/__init__.py libcxxabi/test/libcxxabi/test/config.py libcxxabi/test/lit.site.cfg.in libunwind/CMakeLists.txt libunwind/test/CMakeLists.txt libunwind/test/configs/cmake-bridge.cfg.in libunwind/test/libunwind/__init__.py libunwind/test/libunwind/test/__init__.py libunwind/test/libunwind/test/config.py libunwind/test/lit.site.cfg.in Index: libunwind/test/lit.site.cfg.in === --- libunwind/test/lit.site.cfg.in +++ /dev/null @@ -1,61 +0,0 @@ -@AUTO_GEN_COMMENT@ - -@SERIALIZED_LIT_PARAMS@ - -import os -import site - -config.cxx_under_test = "@CMAKE_CXX_COMPILER@" -config.project_obj_root = "@CMAKE_BINARY_DIR@" -config.install_root = "@CMAKE_BINARY_DIR@" -config.libunwind_src_root = "@LIBUNWIND_SOURCE_DIR@" -config.libunwind_obj_root = "@LIBUNWIND_BINARY_DIR@" -config.abi_library_root = "@LIBUNWIND_LIBRARY_DIR@" -config.libcxx_src_root = "@LIBUNWIND_LIBCXX_PATH@" -config.libunwind_headers= "@LIBUNWIND_SOURCE_DIR@/include" -config.cxx_library_root = "@LIBUNWIND_LIBCXX_LIBRARY_PATH@" -config.llvm_unwinder= True -config.builtins_library = "@LIBUNWIND_BUILTINS_LIBRARY@" -config.enable_threads = @LIBUNWIND_ENABLE_THREADS@ -config.target_info = "@LIBUNWIND_TARGET_INFO@" -config.test_linker_flags= "@LIBUNWIND_TEST_LINKER_FLAGS@" -config.test_compiler_flags = "@LIBUNWIND_TEST_COMPILER_FLAGS@" -config.executor = "@LIBUNWIND_EXECUTOR@" -config.libunwind_shared = @LIBUNWIND_ENABLE_SHARED@ -config.enable_shared= @LIBCXX_ENABLE_SHARED@ -config.arm_ehabi= @LIBUNWIND_USES_ARM_EHABI@ -config.host_triple = "@LLVM_HOST_TRIPLE@" -config.sysroot = "@CMAKE_SYSROOT@" -config.gcc_toolchain= "@CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN@" -config.cxx_ext_threads = @LIBUNWIND_BUILD_EXTERNAL_THREAD_LIBRARY@ -config.x86_cet = @LIBUNWIND_ENABLE_CET@ - -site.addsitedir(os.path.join(config.libunwind_src_root, 'test')) -site.addsitedir(os.path.join(config.libcxx_src_root, 'utils')) - -# name: The name of this test suite. -config.name = 'libunwind' - -# suffixes: A list of file extensions to treat as test files. -config.suffixes = ['.cpp', '.s'] - -# test_source_root: The root path where tests are located. -config.test_source_root = os.path.join(config.libunwind_src_root, 'test') - -# Allow expanding substitutions that are based on other substitutions -config.recursiveExpansionLimit = 10 - -# Infer the test_exec_root from the build directory. -config.test_exec_root = os.path.join(config.libunwind_obj_root, 'test') - -import libcxx.test.format -config.test_format = libcxx.test.format.CxxStandardLibraryTest() - -lit_config.note('Using configuration variant: libunwind') -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.") Index: libunwind/test/libunwind/test/config.py === --- libunwind/test/libunwind/test/config.py +++ /dev/null @@ -1,71 +0,0 @@ -#===--===## -# -# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -# See https://llvm.org/LICENSE.txt for license information. -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -# -#===--===## -import os -import sys - -from libcxx.test.config import Configuration as LibcxxConfiguration - - -class Configuration(LibcxxConfiguration): -# pylint: disable=redefined-outer-name -def __init__(self, lit_config, config): -
[PATCH] D134650: [runtimes] Remove all traces of the legacy testing configuration system
ldionne updated this revision to Diff 464351. ldionne added a comment. Add release note. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D134650/new/ https://reviews.llvm.org/D134650 Files: clang/cmake/caches/CrossWinToARMLinux.cmake libcxx/cmake/caches/MinGW.cmake libcxx/docs/BuildingLibcxx.rst libcxx/docs/ReleaseNotes.rst libcxx/test/CMakeLists.txt libcxx/test/configs/legacy.cfg.in libcxx/utils/ci/buildkite-pipeline.yml libcxx/utils/ci/run-buildbot libcxx/utils/libcxx/compiler.py libcxx/utils/libcxx/test/config.py libcxx/utils/libcxx/test/target_info.py libcxx/utils/libcxx/util.py libcxxabi/test/CMakeLists.txt libcxxabi/test/libcxxabi/__init__.py libcxxabi/test/libcxxabi/test/__init__.py libcxxabi/test/libcxxabi/test/config.py libcxxabi/test/lit.site.cfg.in libunwind/CMakeLists.txt libunwind/test/CMakeLists.txt libunwind/test/configs/cmake-bridge.cfg.in libunwind/test/libunwind/__init__.py libunwind/test/libunwind/test/__init__.py libunwind/test/libunwind/test/config.py libunwind/test/lit.site.cfg.in Index: libunwind/test/lit.site.cfg.in === --- libunwind/test/lit.site.cfg.in +++ /dev/null @@ -1,61 +0,0 @@ -@AUTO_GEN_COMMENT@ - -@SERIALIZED_LIT_PARAMS@ - -import os -import site - -config.cxx_under_test = "@CMAKE_CXX_COMPILER@" -config.project_obj_root = "@CMAKE_BINARY_DIR@" -config.install_root = "@CMAKE_BINARY_DIR@" -config.libunwind_src_root = "@LIBUNWIND_SOURCE_DIR@" -config.libunwind_obj_root = "@LIBUNWIND_BINARY_DIR@" -config.abi_library_root = "@LIBUNWIND_LIBRARY_DIR@" -config.libcxx_src_root = "@LIBUNWIND_LIBCXX_PATH@" -config.libunwind_headers= "@LIBUNWIND_SOURCE_DIR@/include" -config.cxx_library_root = "@LIBUNWIND_LIBCXX_LIBRARY_PATH@" -config.llvm_unwinder= True -config.builtins_library = "@LIBUNWIND_BUILTINS_LIBRARY@" -config.enable_threads = @LIBUNWIND_ENABLE_THREADS@ -config.target_info = "@LIBUNWIND_TARGET_INFO@" -config.test_linker_flags= "@LIBUNWIND_TEST_LINKER_FLAGS@" -config.test_compiler_flags = "@LIBUNWIND_TEST_COMPILER_FLAGS@" -config.executor = "@LIBUNWIND_EXECUTOR@" -config.libunwind_shared = @LIBUNWIND_ENABLE_SHARED@ -config.enable_shared= @LIBCXX_ENABLE_SHARED@ -config.arm_ehabi= @LIBUNWIND_USES_ARM_EHABI@ -config.host_triple = "@LLVM_HOST_TRIPLE@" -config.sysroot = "@CMAKE_SYSROOT@" -config.gcc_toolchain= "@CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN@" -config.cxx_ext_threads = @LIBUNWIND_BUILD_EXTERNAL_THREAD_LIBRARY@ -config.x86_cet = @LIBUNWIND_ENABLE_CET@ - -site.addsitedir(os.path.join(config.libunwind_src_root, 'test')) -site.addsitedir(os.path.join(config.libcxx_src_root, 'utils')) - -# name: The name of this test suite. -config.name = 'libunwind' - -# suffixes: A list of file extensions to treat as test files. -config.suffixes = ['.cpp', '.s'] - -# test_source_root: The root path where tests are located. -config.test_source_root = os.path.join(config.libunwind_src_root, 'test') - -# Allow expanding substitutions that are based on other substitutions -config.recursiveExpansionLimit = 10 - -# Infer the test_exec_root from the build directory. -config.test_exec_root = os.path.join(config.libunwind_obj_root, 'test') - -import libcxx.test.format -config.test_format = libcxx.test.format.CxxStandardLibraryTest() - -lit_config.note('Using configuration variant: libunwind') -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.") Index: libunwind/test/libunwind/test/config.py === --- libunwind/test/libunwind/test/config.py +++ /dev/null @@ -1,71 +0,0 @@ -#===--===## -# -# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -# See https://llvm.org/LICENSE.txt for license information. -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -# -#===--===## -import os -import sys - -from libcxx.test.config import Configuration as LibcxxConfiguration - - -class Configuration(LibcxxConfiguration): -# pylint: disable=redefined-outer-name -def __init__(self, lit_config, config): -super(Configuration, self).__init__(lit_config, config) -self.libunwind_src_root = None -self.libunwind_obj_root = None -
[PATCH] D134650: [runtimes] Remove all traces of the legacy testing configuration system
ldionne added inline comments. Comment at: clang/cmake/caches/CrossWinToARMLinux.cmake:163 set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_COMPILER_RT_EMULATOR "\\\"${Python3_EXECUTABLE}\\\" \\\"${LLVM_PROJECT_DIR}/llvm/utils/remote-exec.py\\\" --execdir %%T --exec-pattern='.*\\.c.*\\.tmp.*' --host=${REMOTE_TEST_USER}@${REMOTE_TEST_HOST}" CACHE STRING "") vvereschaka wrote: > @ldionne `%%T` must be replaced with `%T` for some reason; otherwise we get > the errors during test execution with these differential changes. Everything > else works fine. Thank you. That sounds extremely surprising to me, but I'll do that. Thanks a lot for checking! Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D134650/new/ https://reviews.llvm.org/D134650 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D134650: [runtimes] Remove all traces of the legacy testing configuration system
ldionne updated this revision to Diff 464234. ldionne added a comment. Address comments. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D134650/new/ https://reviews.llvm.org/D134650 Files: clang/cmake/caches/CrossWinToARMLinux.cmake libcxx/cmake/caches/MinGW.cmake libcxx/docs/BuildingLibcxx.rst libcxx/test/CMakeLists.txt libcxx/test/configs/legacy.cfg.in libcxx/utils/ci/buildkite-pipeline.yml libcxx/utils/ci/run-buildbot libcxx/utils/libcxx/compiler.py libcxx/utils/libcxx/test/config.py libcxx/utils/libcxx/test/target_info.py libcxx/utils/libcxx/util.py libcxxabi/test/CMakeLists.txt libcxxabi/test/libcxxabi/__init__.py libcxxabi/test/libcxxabi/test/__init__.py libcxxabi/test/libcxxabi/test/config.py libcxxabi/test/lit.site.cfg.in libunwind/CMakeLists.txt libunwind/test/CMakeLists.txt libunwind/test/configs/cmake-bridge.cfg.in libunwind/test/libunwind/__init__.py libunwind/test/libunwind/test/__init__.py libunwind/test/libunwind/test/config.py libunwind/test/lit.site.cfg.in Index: libunwind/test/lit.site.cfg.in === --- libunwind/test/lit.site.cfg.in +++ /dev/null @@ -1,61 +0,0 @@ -@AUTO_GEN_COMMENT@ - -@SERIALIZED_LIT_PARAMS@ - -import os -import site - -config.cxx_under_test = "@CMAKE_CXX_COMPILER@" -config.project_obj_root = "@CMAKE_BINARY_DIR@" -config.install_root = "@CMAKE_BINARY_DIR@" -config.libunwind_src_root = "@LIBUNWIND_SOURCE_DIR@" -config.libunwind_obj_root = "@LIBUNWIND_BINARY_DIR@" -config.abi_library_root = "@LIBUNWIND_LIBRARY_DIR@" -config.libcxx_src_root = "@LIBUNWIND_LIBCXX_PATH@" -config.libunwind_headers= "@LIBUNWIND_SOURCE_DIR@/include" -config.cxx_library_root = "@LIBUNWIND_LIBCXX_LIBRARY_PATH@" -config.llvm_unwinder= True -config.builtins_library = "@LIBUNWIND_BUILTINS_LIBRARY@" -config.enable_threads = @LIBUNWIND_ENABLE_THREADS@ -config.target_info = "@LIBUNWIND_TARGET_INFO@" -config.test_linker_flags= "@LIBUNWIND_TEST_LINKER_FLAGS@" -config.test_compiler_flags = "@LIBUNWIND_TEST_COMPILER_FLAGS@" -config.executor = "@LIBUNWIND_EXECUTOR@" -config.libunwind_shared = @LIBUNWIND_ENABLE_SHARED@ -config.enable_shared= @LIBCXX_ENABLE_SHARED@ -config.arm_ehabi= @LIBUNWIND_USES_ARM_EHABI@ -config.host_triple = "@LLVM_HOST_TRIPLE@" -config.sysroot = "@CMAKE_SYSROOT@" -config.gcc_toolchain= "@CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN@" -config.cxx_ext_threads = @LIBUNWIND_BUILD_EXTERNAL_THREAD_LIBRARY@ -config.x86_cet = @LIBUNWIND_ENABLE_CET@ - -site.addsitedir(os.path.join(config.libunwind_src_root, 'test')) -site.addsitedir(os.path.join(config.libcxx_src_root, 'utils')) - -# name: The name of this test suite. -config.name = 'libunwind' - -# suffixes: A list of file extensions to treat as test files. -config.suffixes = ['.cpp', '.s'] - -# test_source_root: The root path where tests are located. -config.test_source_root = os.path.join(config.libunwind_src_root, 'test') - -# Allow expanding substitutions that are based on other substitutions -config.recursiveExpansionLimit = 10 - -# Infer the test_exec_root from the build directory. -config.test_exec_root = os.path.join(config.libunwind_obj_root, 'test') - -import libcxx.test.format -config.test_format = libcxx.test.format.CxxStandardLibraryTest() - -lit_config.note('Using configuration variant: libunwind') -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.") Index: libunwind/test/libunwind/test/config.py === --- libunwind/test/libunwind/test/config.py +++ /dev/null @@ -1,71 +0,0 @@ -#===--===## -# -# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -# See https://llvm.org/LICENSE.txt for license information. -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -# -#===--===## -import os -import sys - -from libcxx.test.config import Configuration as LibcxxConfiguration - - -class Configuration(LibcxxConfiguration): -# pylint: disable=redefined-outer-name -def __init__(self, lit_config, config): -super(Configuration, self).__init__(lit_config, config) -self.libunwind_src_root = None -self.libunwind_obj_root = None -self.abi_library_root = None -
[PATCH] D134650: [runtimes] Remove all traces of the legacy testing configuration system
vvereschaka added inline comments. Comment at: clang/cmake/caches/CrossWinToARMLinux.cmake:163 set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_COMPILER_RT_EMULATOR "\\\"${Python3_EXECUTABLE}\\\" \\\"${LLVM_PROJECT_DIR}/llvm/utils/remote-exec.py\\\" --execdir %%T --exec-pattern='.*\\.c.*\\.tmp.*' --host=${REMOTE_TEST_USER}@${REMOTE_TEST_HOST}" CACHE STRING "") @ldionne `%%T` must be replaced with `%T` for some reason; otherwise we get the errors during test execution with these differential changes. Everything else works fine. Thank you. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D134650/new/ https://reviews.llvm.org/D134650 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D134650: [runtimes] Remove all traces of the legacy testing configuration system
ldionne updated this revision to Diff 464060. ldionne added a comment. Rebase on main. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D134650/new/ https://reviews.llvm.org/D134650 Files: clang/cmake/caches/CrossWinToARMLinux.cmake libcxx/cmake/caches/MinGW.cmake libcxx/docs/BuildingLibcxx.rst libcxx/test/CMakeLists.txt libcxx/test/configs/legacy.cfg.in libcxx/utils/ci/buildkite-pipeline.yml libcxx/utils/ci/run-buildbot libcxx/utils/libcxx/compiler.py libcxx/utils/libcxx/test/config.py libcxx/utils/libcxx/test/target_info.py libcxx/utils/libcxx/util.py libcxxabi/test/CMakeLists.txt libcxxabi/test/libcxxabi/__init__.py libcxxabi/test/libcxxabi/test/__init__.py libcxxabi/test/libcxxabi/test/config.py libcxxabi/test/lit.site.cfg.in libunwind/CMakeLists.txt libunwind/test/CMakeLists.txt libunwind/test/configs/cmake-bridge.cfg.in libunwind/test/libunwind/__init__.py libunwind/test/libunwind/test/__init__.py libunwind/test/libunwind/test/config.py libunwind/test/lit.site.cfg.in Index: libunwind/test/lit.site.cfg.in === --- libunwind/test/lit.site.cfg.in +++ /dev/null @@ -1,61 +0,0 @@ -@AUTO_GEN_COMMENT@ - -@SERIALIZED_LIT_PARAMS@ - -import os -import site - -config.cxx_under_test = "@CMAKE_CXX_COMPILER@" -config.project_obj_root = "@CMAKE_BINARY_DIR@" -config.install_root = "@CMAKE_BINARY_DIR@" -config.libunwind_src_root = "@LIBUNWIND_SOURCE_DIR@" -config.libunwind_obj_root = "@LIBUNWIND_BINARY_DIR@" -config.abi_library_root = "@LIBUNWIND_LIBRARY_DIR@" -config.libcxx_src_root = "@LIBUNWIND_LIBCXX_PATH@" -config.libunwind_headers= "@LIBUNWIND_SOURCE_DIR@/include" -config.cxx_library_root = "@LIBUNWIND_LIBCXX_LIBRARY_PATH@" -config.llvm_unwinder= True -config.builtins_library = "@LIBUNWIND_BUILTINS_LIBRARY@" -config.enable_threads = @LIBUNWIND_ENABLE_THREADS@ -config.target_info = "@LIBUNWIND_TARGET_INFO@" -config.test_linker_flags= "@LIBUNWIND_TEST_LINKER_FLAGS@" -config.test_compiler_flags = "@LIBUNWIND_TEST_COMPILER_FLAGS@" -config.executor = "@LIBUNWIND_EXECUTOR@" -config.libunwind_shared = @LIBUNWIND_ENABLE_SHARED@ -config.enable_shared= @LIBCXX_ENABLE_SHARED@ -config.arm_ehabi= @LIBUNWIND_USES_ARM_EHABI@ -config.host_triple = "@LLVM_HOST_TRIPLE@" -config.sysroot = "@CMAKE_SYSROOT@" -config.gcc_toolchain= "@CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN@" -config.cxx_ext_threads = @LIBUNWIND_BUILD_EXTERNAL_THREAD_LIBRARY@ -config.x86_cet = @LIBUNWIND_ENABLE_CET@ - -site.addsitedir(os.path.join(config.libunwind_src_root, 'test')) -site.addsitedir(os.path.join(config.libcxx_src_root, 'utils')) - -# name: The name of this test suite. -config.name = 'libunwind' - -# suffixes: A list of file extensions to treat as test files. -config.suffixes = ['.cpp', '.s'] - -# test_source_root: The root path where tests are located. -config.test_source_root = os.path.join(config.libunwind_src_root, 'test') - -# Allow expanding substitutions that are based on other substitutions -config.recursiveExpansionLimit = 10 - -# Infer the test_exec_root from the build directory. -config.test_exec_root = os.path.join(config.libunwind_obj_root, 'test') - -import libcxx.test.format -config.test_format = libcxx.test.format.CxxStandardLibraryTest() - -lit_config.note('Using configuration variant: libunwind') -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.") Index: libunwind/test/libunwind/test/config.py === --- libunwind/test/libunwind/test/config.py +++ /dev/null @@ -1,71 +0,0 @@ -#===--===## -# -# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -# See https://llvm.org/LICENSE.txt for license information. -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -# -#===--===## -import os -import sys - -from libcxx.test.config import Configuration as LibcxxConfiguration - - -class Configuration(LibcxxConfiguration): -# pylint: disable=redefined-outer-name -def __init__(self, lit_config, config): -super(Configuration, self).__init__(lit_config, config) -self.libunwind_src_root = None -self.libunwind_obj_root = None -self.abi_library_root = None -
[PATCH] D134650: [runtimes] Remove all traces of the legacy testing configuration system
ldionne added a subscriber: vvereschaka. ldionne added a comment. @vvereschaka Can you please confirm that the CMake cache changes look good to you? Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D134650/new/ https://reviews.llvm.org/D134650 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D134650: [runtimes] Remove all traces of the legacy testing configuration system
ldionne created this revision. Herald added subscribers: libcxx-commits, mstorsjo, arichardson. Herald added projects: libunwind, All. Herald added a reviewer: libunwind. ldionne requested review of this revision. Herald added projects: clang, libc++, libc++abi. Herald added a subscriber: cfe-commits. Herald added a reviewer: libc++. Herald added a reviewer: libc++abi. Now that all jobs have moved over to the new style of Lit configuration, we can remove all traces of the legacy testing configuration system. This includes: - Cache settings that are not honored or useful anymore - Several CMake options that were only useful in the context of the legacy Lit configuration system - A bunch of Python support code that is not used anymore - The legacy lit.cfg.in files themselves Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D134650 Files: clang/cmake/caches/CrossWinToARMLinux.cmake libcxx/cmake/caches/MinGW.cmake libcxx/docs/BuildingLibcxx.rst libcxx/test/CMakeLists.txt libcxx/test/configs/legacy.cfg.in libcxx/utils/ci/buildkite-pipeline.yml libcxx/utils/ci/run-buildbot libcxx/utils/libcxx/compiler.py libcxx/utils/libcxx/test/config.py libcxx/utils/libcxx/test/target_info.py libcxx/utils/libcxx/util.py libcxxabi/test/CMakeLists.txt libcxxabi/test/libcxxabi/__init__.py libcxxabi/test/libcxxabi/test/__init__.py libcxxabi/test/libcxxabi/test/config.py libcxxabi/test/lit.site.cfg.in libunwind/CMakeLists.txt libunwind/test/CMakeLists.txt libunwind/test/configs/cmake-bridge.cfg.in libunwind/test/libunwind/__init__.py libunwind/test/libunwind/test/__init__.py libunwind/test/libunwind/test/config.py libunwind/test/lit.site.cfg.in Index: libunwind/test/lit.site.cfg.in === --- libunwind/test/lit.site.cfg.in +++ /dev/null @@ -1,61 +0,0 @@ -@AUTO_GEN_COMMENT@ - -@SERIALIZED_LIT_PARAMS@ - -import os -import site - -config.cxx_under_test = "@CMAKE_CXX_COMPILER@" -config.project_obj_root = "@CMAKE_BINARY_DIR@" -config.install_root = "@CMAKE_BINARY_DIR@" -config.libunwind_src_root = "@LIBUNWIND_SOURCE_DIR@" -config.libunwind_obj_root = "@LIBUNWIND_BINARY_DIR@" -config.abi_library_root = "@LIBUNWIND_LIBRARY_DIR@" -config.libcxx_src_root = "@LIBUNWIND_LIBCXX_PATH@" -config.libunwind_headers= "@LIBUNWIND_SOURCE_DIR@/include" -config.cxx_library_root = "@LIBUNWIND_LIBCXX_LIBRARY_PATH@" -config.llvm_unwinder= True -config.builtins_library = "@LIBUNWIND_BUILTINS_LIBRARY@" -config.enable_threads = @LIBUNWIND_ENABLE_THREADS@ -config.target_info = "@LIBUNWIND_TARGET_INFO@" -config.test_linker_flags= "@LIBUNWIND_TEST_LINKER_FLAGS@" -config.test_compiler_flags = "@LIBUNWIND_TEST_COMPILER_FLAGS@" -config.executor = "@LIBUNWIND_EXECUTOR@" -config.libunwind_shared = @LIBUNWIND_ENABLE_SHARED@ -config.enable_shared= @LIBCXX_ENABLE_SHARED@ -config.arm_ehabi= @LIBUNWIND_USES_ARM_EHABI@ -config.host_triple = "@LLVM_HOST_TRIPLE@" -config.sysroot = "@CMAKE_SYSROOT@" -config.gcc_toolchain= "@CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN@" -config.cxx_ext_threads = @LIBUNWIND_BUILD_EXTERNAL_THREAD_LIBRARY@ -config.x86_cet = @LIBUNWIND_ENABLE_CET@ - -site.addsitedir(os.path.join(config.libunwind_src_root, 'test')) -site.addsitedir(os.path.join(config.libcxx_src_root, 'utils')) - -# name: The name of this test suite. -config.name = 'libunwind' - -# suffixes: A list of file extensions to treat as test files. -config.suffixes = ['.cpp', '.s'] - -# test_source_root: The root path where tests are located. -config.test_source_root = os.path.join(config.libunwind_src_root, 'test') - -# Allow expanding substitutions that are based on other substitutions -config.recursiveExpansionLimit = 10 - -# Infer the test_exec_root from the build directory. -config.test_exec_root = os.path.join(config.libunwind_obj_root, 'test') - -import libcxx.test.format -config.test_format = libcxx.test.format.CxxStandardLibraryTest() - -lit_config.note('Using configuration variant: libunwind') -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.") Index: libunwind/test/libunwind/test/config.py === --- libunwind/test/libunwind/test/config.py +++ /dev/null @@ -1,71 +0,0 @@ -#===--===## -# -# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -# See