broadwaylamb created this revision.
broadwaylamb added reviewers: aorlov, vvereschaka, andreil99.
Herald added subscribers: cfe-commits, ldionne, kristof.beyls, mgorny.
Herald added a reviewer: EricWF.
Herald added a project: clang.
`filesystem` tests are not yet supported when running tests on a remote board,
because the testing infrastructure isn't quite ready for it yet. Supporting
`filesystem` in the infrastructure is non-trivial, so I suggest disabling these
tests for now.
Also, pass through LIT arguments to builtins and runtimes (they were not passed
through before). I'm not sure about this change though, as we may want to
differentiate between LIT arguments for llvm/clang tests from those for
libunwind/libc++abi/libc++ tests. For example, we may want to specify a higher
number of threads for the tests that are run remotely, as it significantly
speeds up the test suite. Please let me know what you think.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D72717
Files:
clang/cmake/caches/CrossWinToARMLinux.cmake
Index: clang/cmake/caches/CrossWinToARMLinux.cmake
===================================================================
--- clang/cmake/caches/CrossWinToARMLinux.cmake
+++ clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -54,7 +54,9 @@
set(LLVM_ENABLE_RUNTIMES
"compiler-rt;libunwind;libcxxabi;libcxx" CACHE STRING "")
set(LLVM_DEFAULT_TARGET_TRIPLE "${CMAKE_C_COMPILER_TARGET}" CACHE
STRING "")
set(LLVM_TARGET_ARCH "${CMAKE_C_COMPILER_TARGET}" CACHE
STRING "")
-set(LLVM_LIT_ARGS "-vv ${LLVM_LIT_ARGS}" CACHE
STRING "" FORCE)
+
+# Note that testing the 'filesystem' header from libc++ is not yet supported
in remote configuration.
+set(LLVM_LIT_ARGS "-vv --param
enable_filesystem=False ${LLVM_LIT_ARGS}" CACHE STRING "" FORCE)
set(CLANG_DEFAULT_LINKER "lld" CACHE STRING "")
@@ -84,8 +86,15 @@
set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING
"")
set(LIBCXX_ENABLE_SHARED OFF CACHE BOOL "")
-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(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;\
+ -DCMAKE_AR=${CMAKE_AR};\
+ -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}"
+ CACHE STRING "")
+
+set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;\
+ -DCMAKE_AR=${CMAKE_AR};\
+ -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}"
+ CACHE STRING "")
# Remote test configuration.
if(DEFINED REMOTE_TEST_HOST)
Index: clang/cmake/caches/CrossWinToARMLinux.cmake
===================================================================
--- clang/cmake/caches/CrossWinToARMLinux.cmake
+++ clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -54,7 +54,9 @@
set(LLVM_ENABLE_RUNTIMES "compiler-rt;libunwind;libcxxabi;libcxx" CACHE STRING "")
set(LLVM_DEFAULT_TARGET_TRIPLE "${CMAKE_C_COMPILER_TARGET}" CACHE STRING "")
set(LLVM_TARGET_ARCH "${CMAKE_C_COMPILER_TARGET}" CACHE STRING "")
-set(LLVM_LIT_ARGS "-vv ${LLVM_LIT_ARGS}" CACHE STRING "" FORCE)
+
+# Note that testing the 'filesystem' header from libc++ is not yet supported in remote configuration.
+set(LLVM_LIT_ARGS "-vv --param enable_filesystem=False ${LLVM_LIT_ARGS}" CACHE STRING "" FORCE)
set(CLANG_DEFAULT_LINKER "lld" CACHE STRING "")
@@ -84,8 +86,15 @@
set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING "")
set(LIBCXX_ENABLE_SHARED OFF CACHE BOOL "")
-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(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;\
+ -DCMAKE_AR=${CMAKE_AR};\
+ -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}"
+ CACHE STRING "")
+
+set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;\
+ -DCMAKE_AR=${CMAKE_AR};\
+ -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}"
+ CACHE STRING "")
# Remote test configuration.
if(DEFINED REMOTE_TEST_HOST)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
