This is an archive of the discontinued LLVM Phabricator instance.

[CMake] Added remote test execution support into CrossWinToARMLinux CMake cache file.
ClosedPublic

Authored by vvereschaka on Dec 17 2019, 1:07 PM.

Download Raw Diff

Details

Reviewers

aorlov
andreil99
broadwaylamb

Commits

rGeadc97b0ec87: [CMake] Added remote test execution support into CrossWinToARMLinux CMake cache…

Summary

Added two configuration arguments 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.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

vvereschaka created this revision.Dec 17 2019, 1:07 PM

Herald added a project: Restricted Project. · View Herald TranscriptDec 17 2019, 1:07 PM

Herald added subscribers: cfe-commits, kristof.beyls, mgorny. · View Herald Transcript

LGTM

clang/cmake/caches/CrossWinToARMLinux.cmake
88–91	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.

vvereschaka updated this revision to Diff 234407.Dec 17 2019, 3:37 PM

I have updated the diff without using those options.

Renamed configuration arguments to REMOTE_TEST_HOST and REMOTE_TEST_USER

Thanks, Vlad!

This revision is now accepted and ready to land.Dec 20 2019, 7:09 PM

Closed by commit rGeadc97b0ec87: [CMake] Added remote test execution support into CrossWinToARMLinux CMake cache… (authored by vvereschaka). · Explain WhyDec 29 2019, 8:44 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

clang/

cmake/

caches/

CrossWinToARMLinux.cmake

30 lines

Diff 235534

clang/cmake/caches/CrossWinToARMLinux.cmake

	# CrossWinToARMLinux.cmake			# CrossWinToARMLinux.cmake
	#			#
	# Set up a CMakeCache for a cross Windows to ARM Linux toolchain build.			# Set up a CMakeCache for a cross Windows to ARM Linux toolchain build.
	#			#
	# This cache file can be used to build a cross toolchain to ARM Linux			# This cache file can be used to build a cross toolchain to ARM Linux
	# on Windows platform.			# on Windows platform.
	#			#
	# NOTE: the build requires a development ARM Linux root filesystem to use			# NOTE: the build requires a development ARM Linux root filesystem to use
	# proper target platform depended library and header files.			# proper target platform depended library and header files.
	#			#
	# Configure:			# Configure:
	# cmake -G Ninja ^			# cmake -G Ninja ^
	# -DCMAKE_INSTALL_PREFIX=../install ^			# -DCMAKE_INSTALL_PREFIX=../install ^
	# -DDEFAULT_SYSROOT=<path-to-develop-arm-linux-root-fs> ^			# -DDEFAULT_SYSROOT=<path-to-develop-arm-linux-root-fs> ^
	# -DLLVM_AR=<llvm_obj_root>/bin/llvm-ar[.exe] ^			# -DLLVM_AR=<llvm_obj_root>/bin/llvm-ar[.exe] ^
	# -DCMAKE_CXX_FLAGS="-D__OPTIMIZE__" ^			# -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 ^			# -C<llvm_src_root>/llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake ^
	# <llvm_src_root>/llvm-project/llvm			# <llvm_src_root>/llvm-project/llvm
	# Build:			# Build:
	# cmake --build . --target install			# cmake --build . --target install
	# Test:			# Test:
	# cmake --build . --target check-llvm			# cmake --build . --target check-llvm
	# cmake --build . --target check-clang			# cmake --build . --target check-clang
	# cmake --build . --target check-lld			# cmake --build . --target check-lld
	▲ Show 20 Lines • Show All 52 Lines • ▼ Show 20 Lines

	set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")			set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
	set(LIBCXX_TARGET_TRIPLE "${CMAKE_C_COMPILER_TARGET}" CACHE STRING "")			set(LIBCXX_TARGET_TRIPLE "${CMAKE_C_COMPILER_TARGET}" CACHE STRING "")
	set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING "")			set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING "")

	set(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" 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(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")

				# 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")

				broadwaylambUnsubmitted Done Reply Inline Actions 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. broadwaylamb: These options haven't yet made it into the upstream, maybe it's better remove them for now and…
				# 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_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "")
	set(LLVM_TOOLCHAIN_TOOLS			set(LLVM_TOOLCHAIN_TOOLS
	llvm-ar			llvm-ar
	llvm-cov			llvm-cov
	llvm-cxxfilt			llvm-cxxfilt
	llvm-dwarfdump			llvm-dwarfdump
	llvm-lib			llvm-lib
	llvm-nm			llvm-nm
	llvm-objdump			llvm-objdump
	Show All 16 Lines