[PATCH] D71625: [CMake] Added remote test execution support into CrossWinToARMLinux CMake cache file.
This revision was automatically updated to reflect the committed changes. Closed by commit rGeadc97b0ec87: [CMake] Added remote test execution support into CrossWinToARMLinux CMake cacheā¦ (authored by vvereschaka). Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D71625/new/ https://reviews.llvm.org/D71625 Files: clang/cmake/caches/CrossWinToARMLinux.cmake Index: clang/cmake/caches/CrossWinToARMLinux.cmake === --- clang/cmake/caches/CrossWinToARMLinux.cmake +++ clang/cmake/caches/CrossWinToARMLinux.cmake @@ -14,6 +14,8 @@ # -DDEFAULT_SYSROOT= ^ # -DLLVM_AR=/bin/llvm-ar[.exe] ^ # -DCMAKE_CXX_FLAGS="-D__OPTIMIZE__" ^ +# -DREMOTE_TEST_HOST="" ^ +# -DREMOTE_TEST_USER="" ^ # -C/llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake ^ # /llvm-project/llvm # Build: @@ -82,7 +84,33 @@ set(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") -set(LLVM_INSTALL_TOOLCHAIN_ONLYON CACHE BOOL "") +# Remote test configuration. +if(DEFINED REMOTE_TEST_HOST) + set(DEFAULT_TEST_EXECUTOR "SSHExecutor('${REMOTE_TEST_HOST}', '${REMOTE_TEST_USER}')") + set(DEFAULT_TEST_TARGET_INFO "libcxx.test.target_info.LinuxLocalTI") + + # Allow override with the custom values. + if(NOT DEFINED LIBUNWIND_TARGET_INFO) +set(LIBUNWIND_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBUNWIND_EXECUTOR) +set(LIBUNWIND_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_TARGET_INFO) +set(LIBCXXABI_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_EXECUTOR) +set(LIBCXXABI_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_TARGET_INFO) +set(LIBCXX_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_EXECUTOR) +set(LIBCXX_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() +endif() + +set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_TOOLCHAIN_TOOLS llvm-ar llvm-cov Index: clang/cmake/caches/CrossWinToARMLinux.cmake === --- clang/cmake/caches/CrossWinToARMLinux.cmake +++ clang/cmake/caches/CrossWinToARMLinux.cmake @@ -14,6 +14,8 @@ # -DDEFAULT_SYSROOT= ^ # -DLLVM_AR=/bin/llvm-ar[.exe] ^ # -DCMAKE_CXX_FLAGS="-D__OPTIMIZE__" ^ +# -DREMOTE_TEST_HOST="" ^ +# -DREMOTE_TEST_USER="" ^ # -C/llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake ^ # /llvm-project/llvm # Build: @@ -82,7 +84,33 @@ set(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") -set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") +# Remote test configuration. +if(DEFINED REMOTE_TEST_HOST) + set(DEFAULT_TEST_EXECUTOR "SSHExecutor('${REMOTE_TEST_HOST}', '${REMOTE_TEST_USER}')") + set(DEFAULT_TEST_TARGET_INFO "libcxx.test.target_info.LinuxLocalTI") + + # Allow override with the custom values. + if(NOT DEFINED LIBUNWIND_TARGET_INFO) +set(LIBUNWIND_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBUNWIND_EXECUTOR) +set(LIBUNWIND_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_TARGET_INFO) +set(LIBCXXABI_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_EXECUTOR) +set(LIBCXXABI_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_TARGET_INFO) +set(LIBCXX_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_EXECUTOR) +set(LIBCXX_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() +endif() + +set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_TOOLCHAIN_TOOLS llvm-ar llvm-cov ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D71625: [CMake] Added remote test execution support into CrossWinToARMLinux CMake cache file.
andreil99 accepted this revision. andreil99 added a comment. This revision is now accepted and ready to land. Thanks, Vlad! Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D71625/new/ https://reviews.llvm.org/D71625 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D71625: [CMake] Added remote test execution support into CrossWinToARMLinux CMake cache file.
vvereschaka updated this revision to Diff 234617. vvereschaka edited the summary of this revision. vvereschaka added a comment. Renamed configuration arguments to REMOTE_TEST_HOST and REMOTE_TEST_USER Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D71625/new/ https://reviews.llvm.org/D71625 Files: clang/cmake/caches/CrossWinToARMLinux.cmake Index: clang/cmake/caches/CrossWinToARMLinux.cmake === --- clang/cmake/caches/CrossWinToARMLinux.cmake +++ clang/cmake/caches/CrossWinToARMLinux.cmake @@ -14,6 +14,8 @@ # -DDEFAULT_SYSROOT= ^ # -DLLVM_AR=/bin/llvm-ar[.exe] ^ # -DCMAKE_CXX_FLAGS="-D__OPTIMIZE__" ^ +# -DREMOTE_TEST_HOST="" ^ +# -DREMOTE_TEST_USER="" ^ # -C/llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake ^ # /llvm-project/llvm # Build: @@ -82,7 +84,33 @@ set(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") -set(LLVM_INSTALL_TOOLCHAIN_ONLYON CACHE BOOL "") +# Remote test configuration. +if(DEFINED REMOTE_TEST_HOST) + set(DEFAULT_TEST_EXECUTOR "SSHExecutor('${REMOTE_TEST_HOST}', '${REMOTE_TEST_USER}')") + set(DEFAULT_TEST_TARGET_INFO "libcxx.test.target_info.LinuxLocalTI") + + # Allow override with the custom values. + if(NOT DEFINED LIBUNWIND_TARGET_INFO) +set(LIBUNWIND_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBUNWIND_EXECUTOR) +set(LIBUNWIND_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_TARGET_INFO) +set(LIBCXXABI_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_EXECUTOR) +set(LIBCXXABI_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_TARGET_INFO) +set(LIBCXX_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_EXECUTOR) +set(LIBCXX_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() +endif() + +set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_TOOLCHAIN_TOOLS llvm-ar llvm-cov Index: clang/cmake/caches/CrossWinToARMLinux.cmake === --- clang/cmake/caches/CrossWinToARMLinux.cmake +++ clang/cmake/caches/CrossWinToARMLinux.cmake @@ -14,6 +14,8 @@ # -DDEFAULT_SYSROOT= ^ # -DLLVM_AR=/bin/llvm-ar[.exe] ^ # -DCMAKE_CXX_FLAGS="-D__OPTIMIZE__" ^ +# -DREMOTE_TEST_HOST="" ^ +# -DREMOTE_TEST_USER="" ^ # -C/llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake ^ # /llvm-project/llvm # Build: @@ -82,7 +84,33 @@ set(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") -set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") +# Remote test configuration. +if(DEFINED REMOTE_TEST_HOST) + set(DEFAULT_TEST_EXECUTOR "SSHExecutor('${REMOTE_TEST_HOST}', '${REMOTE_TEST_USER}')") + set(DEFAULT_TEST_TARGET_INFO "libcxx.test.target_info.LinuxLocalTI") + + # Allow override with the custom values. + if(NOT DEFINED LIBUNWIND_TARGET_INFO) +set(LIBUNWIND_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBUNWIND_EXECUTOR) +set(LIBUNWIND_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_TARGET_INFO) +set(LIBCXXABI_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_EXECUTOR) +set(LIBCXXABI_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_TARGET_INFO) +set(LIBCXX_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_EXECUTOR) +set(LIBCXX_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() +endif() + +set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_TOOLCHAIN_TOOLS llvm-ar llvm-cov ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D71625: [CMake] Added remote test execution support into CrossWinToARMLinux CMake cache file.
vvereschaka marked 2 inline comments as done. vvereschaka added a comment. I have updated the diff without using those options. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D71625/new/ https://reviews.llvm.org/D71625 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D71625: [CMake] Added remote test execution support into CrossWinToARMLinux CMake cache file.
vvereschaka updated this revision to Diff 234407. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D71625/new/ https://reviews.llvm.org/D71625 Files: clang/cmake/caches/CrossWinToARMLinux.cmake Index: clang/cmake/caches/CrossWinToARMLinux.cmake === --- clang/cmake/caches/CrossWinToARMLinux.cmake +++ clang/cmake/caches/CrossWinToARMLinux.cmake @@ -14,6 +14,8 @@ # -DDEFAULT_SYSROOT= ^ # -DLLVM_AR=/bin/llvm-ar[.exe] ^ # -DCMAKE_CXX_FLAGS="-D__OPTIMIZE__" ^ +# -DREMOTE_TEST_EXECUTE_HOST="" ^ +# -DREMOTE_TEST_EXECUTE_USER="" ^ # -C/llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake ^ # /llvm-project/llvm # Build: @@ -82,7 +84,33 @@ set(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") -set(LLVM_INSTALL_TOOLCHAIN_ONLYON CACHE BOOL "") +# Remote test configuration. +if(DEFINED REMOTE_TEST_EXECUTE_HOST) + set(DEFAULT_TEST_EXECUTOR "SSHExecutor('${REMOTE_TEST_EXECUTE_HOST}', '${REMOTE_TEST_EXECUTE_USER}')") + set(DEFAULT_TEST_TARGET_INFO "libcxx.test.target_info.LinuxLocalTI") + + # Allow override with the custom values. + if(NOT DEFINED LIBUNWIND_TARGET_INFO) +set(LIBUNWIND_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBUNWIND_EXECUTOR) +set(LIBUNWIND_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_TARGET_INFO) +set(LIBCXXABI_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_EXECUTOR) +set(LIBCXXABI_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_TARGET_INFO) +set(LIBCXX_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_EXECUTOR) +set(LIBCXX_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() +endif() + +set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_TOOLCHAIN_TOOLS llvm-ar llvm-cov Index: clang/cmake/caches/CrossWinToARMLinux.cmake === --- clang/cmake/caches/CrossWinToARMLinux.cmake +++ clang/cmake/caches/CrossWinToARMLinux.cmake @@ -14,6 +14,8 @@ # -DDEFAULT_SYSROOT= ^ # -DLLVM_AR=/bin/llvm-ar[.exe] ^ # -DCMAKE_CXX_FLAGS="-D__OPTIMIZE__" ^ +# -DREMOTE_TEST_EXECUTE_HOST="" ^ +# -DREMOTE_TEST_EXECUTE_USER="" ^ # -C/llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake ^ # /llvm-project/llvm # Build: @@ -82,7 +84,33 @@ set(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") -set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") +# Remote test configuration. +if(DEFINED REMOTE_TEST_EXECUTE_HOST) + set(DEFAULT_TEST_EXECUTOR "SSHExecutor('${REMOTE_TEST_EXECUTE_HOST}', '${REMOTE_TEST_EXECUTE_USER}')") + set(DEFAULT_TEST_TARGET_INFO "libcxx.test.target_info.LinuxLocalTI") + + # Allow override with the custom values. + if(NOT DEFINED LIBUNWIND_TARGET_INFO) +set(LIBUNWIND_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBUNWIND_EXECUTOR) +set(LIBUNWIND_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_TARGET_INFO) +set(LIBCXXABI_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_EXECUTOR) +set(LIBCXXABI_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_TARGET_INFO) +set(LIBCXX_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_EXECUTOR) +set(LIBCXX_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() +endif() + +set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_TOOLCHAIN_TOOLS llvm-ar llvm-cov ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D71625: [CMake] Added remote test execution support into CrossWinToARMLinux CMake cache file.
broadwaylamb added a comment. LGTM Comment at: clang/cmake/caches/CrossWinToARMLinux.cmake:88-91 +set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXABI OFF CACHE BOOL "") +set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXX OFF CACHE BOOL "") +set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXOFF CACHE BOOL "") +set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI OFF CACHE BOOL "") These options haven't yet made it into the upstream, maybe it's better remove them for now and add them later when they're stabilized. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D71625/new/ https://reviews.llvm.org/D71625 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D71625: [CMake] Added remote test execution support into CrossWinToARMLinux CMake cache file.
vvereschaka created this revision. vvereschaka added reviewers: aorlov, andreil99, broadwaylamb. Herald added subscribers: cfe-commits, kristof.beyls, mgorny. Herald added a project: clang. Added two confguration argument to provide a host name and SSH user name to run the tests on the remote target host. - REMOTE_TEST_EXECUTE_HOST - remote host name or address. - REMOTE_TEST_EXECUTE_USER - passwordless SSH account name. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D71625 Files: clang/cmake/caches/CrossWinToARMLinux.cmake Index: clang/cmake/caches/CrossWinToARMLinux.cmake === --- clang/cmake/caches/CrossWinToARMLinux.cmake +++ clang/cmake/caches/CrossWinToARMLinux.cmake @@ -14,6 +14,8 @@ # -DDEFAULT_SYSROOT= ^ # -DLLVM_AR=/bin/llvm-ar[.exe] ^ # -DCMAKE_CXX_FLAGS="-D__OPTIMIZE__" ^ +# -DREMOTE_TEST_EXECUTE_HOST="" ^ +# -DREMOTE_TEST_EXECUTE_USER="" ^ # -C/llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake ^ # /llvm-project/llvm # Build: @@ -82,7 +84,39 @@ set(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") -set(LLVM_INSTALL_TOOLCHAIN_ONLYON CACHE BOOL "") +# Test configuration. +set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXABI OFF CACHE BOOL "") +set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXX OFF CACHE BOOL "") +set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXOFF CACHE BOOL "") +set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI OFF CACHE BOOL "") + +# Remote tests. +if(DEFINED REMOTE_TEST_EXECUTE_HOST) + set(DEFAULT_TEST_EXECUTOR "SSHExecutor('${REMOTE_TEST_EXECUTE_HOST}', '${REMOTE_TEST_EXECUTE_USER}')") + set(DEFAULT_TEST_TARGET_INFO "libcxx.test.target_info.LinuxLocalTI") + + # Allow override with the custom values. + if(NOT DEFINED LIBUNWIND_TARGET_INFO) +set(LIBUNWIND_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBUNWIND_EXECUTOR) +set(LIBUNWIND_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_TARGET_INFO) +set(LIBCXXABI_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_EXECUTOR) +set(LIBCXXABI_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_TARGET_INFO) +set(LIBCXX_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXX_EXECUTOR) +set(LIBCXX_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() +endif() + +set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_TOOLCHAIN_TOOLS llvm-ar llvm-cov Index: clang/cmake/caches/CrossWinToARMLinux.cmake === --- clang/cmake/caches/CrossWinToARMLinux.cmake +++ clang/cmake/caches/CrossWinToARMLinux.cmake @@ -14,6 +14,8 @@ # -DDEFAULT_SYSROOT= ^ # -DLLVM_AR=/bin/llvm-ar[.exe] ^ # -DCMAKE_CXX_FLAGS="-D__OPTIMIZE__" ^ +# -DREMOTE_TEST_EXECUTE_HOST="" ^ +# -DREMOTE_TEST_EXECUTE_USER="" ^ # -C/llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake ^ # /llvm-project/llvm # Build: @@ -82,7 +84,39 @@ set(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") -set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") +# Test configuration. +set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXABI OFF CACHE BOOL "") +set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXX OFF CACHE BOOL "") +set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXOFF CACHE BOOL "") +set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI OFF CACHE BOOL "") + +# Remote tests. +if(DEFINED REMOTE_TEST_EXECUTE_HOST) + set(DEFAULT_TEST_EXECUTOR "SSHExecutor('${REMOTE_TEST_EXECUTE_HOST}', '${REMOTE_TEST_EXECUTE_USER}')") + set(DEFAULT_TEST_TARGET_INFO "libcxx.test.target_info.LinuxLocalTI") + + # Allow override with the custom values. + if(NOT DEFINED LIBUNWIND_TARGET_INFO) +set(LIBUNWIND_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBUNWIND_EXECUTOR) +set(LIBUNWIND_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_TARGET_INFO) +set(LIBCXXABI_TARGET_INFO "${DEFAULT_TEST_TARGET_INFO}" CACHE STRING "") + endif() + if(NOT DEFINED LIBCXXABI_EXECUTOR) +set(LIBCXXABI_EXECUTOR "${DEFAULT_TEST_EXECUTOR}" CACHE