diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake b/clang/cmake/caches/CrossWinToARMLinux.cmake --- a/clang/cmake/caches/CrossWinToARMLinux.cmake +++ b/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