[PATCH] D71625: [CMake] Added remote test execution support into CrossWinToARMLinux CMake cache file.

[Vlad Vereschaka via Phabricator via cfe-commits]

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=<path-to-develop-arm-linux-root-fs> ^
 #       -DLLVM_AR=<llvm_obj_root>/bin/llvm-ar[.exe] ^
 #       -DCMAKE_CXX_FLAGS="-D__OPTIMIZE__" ^
+#       -DREMOTE_TEST_EXECUTE_HOST="<hostname>" ^
+#       -DREMOTE_TEST_EXECUTE_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,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_LIBCXX        OFF 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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D71625.234374.patch
Type: text/x-patch
Size: 2514 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20191217/279bdd8d/attachment.bin>