[clang] eadc97b - [CMake] Added remote test execution support into CrossWinToARMLinux CMake cache file.
Vladimir Vereschaka via cfe-commits
cfe-commits at lists.llvm.org
Sun Dec 29 20:40:13 PST 2019
Author: Vladimir Vereschaka
Date: 2019-12-29T20:36:19-08:00
New Revision: eadc97b0ec87801ddcf35f03d1d005f9929a5254
URL: https://github.com/llvm/llvm-project/commit/eadc97b0ec87801ddcf35f03d1d005f9929a5254
DIFF: https://github.com/llvm/llvm-project/commit/eadc97b0ec87801ddcf35f03d1d005f9929a5254.diff
LOG: [CMake] Added remote test execution support into CrossWinToARMLinux CMake cache file.
Added two confguration argument to provide a host name and SSH user name
to run the tests on the remote target host.
* REMOTE_TEST_HOST - remote host name or address.
* REMOTE_TEST_USER - passwordless SSH account name.
Differential Revision: https://reviews.llvm.org/D71625
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
################################################################################
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 944465411363..9fbf090767e9 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -14,6 +14,8 @@
# -DDEFAULT_SYSROOT=<path-to-develop-arm-linux-root-fs> ^
# -DLLVM_AR=<llvm_obj_root>/bin/llvm-ar[.exe] ^
# -DCMAKE_CXX_FLAGS="-D__OPTIMIZE__" ^
+# -DREMOTE_TEST_HOST="<hostname>" ^
+# -DREMOTE_TEST_USER="<ssh_user_name>" ^
# -C<llvm_src_root>/llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake ^
# <llvm_src_root>/llvm-project/llvm
# Build:
@@ -82,7 +84,33 @@ set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING ""
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
More information about the cfe-commits
mailing list