diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | test/lit.common.configured.in | 4 | ||||
| -rw-r--r-- | test/sanitizer_common/TestCases/Linux/ptrace.cc | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ce4ae76d..da49e5ecd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,6 +137,12 @@ else() set(COMPILER_RT_TEST_COMPILER_ID GNU) endif() +# Tests using XFAIL use the first value in COMPILER_RT_TEST_TARGET_TRIPLE +set(COMPILER_RT_TEST_TARGET_TRIPLE ${TARGET_TRIPLE} CACHE STRING + "Default triple for cross-compiled executables") +string(REPLACE "-" ";" TARGET_TRIPLE_LIST ${COMPILER_RT_TEST_TARGET_TRIPLE}) +list(GET TARGET_TRIPLE_LIST 0 COMPILER_RT_TEST_TARGET_ARCH) + string(TOLOWER ${CMAKE_SYSTEM_NAME} COMPILER_RT_OS_DIR) set(COMPILER_RT_LIBRARY_OUTPUT_DIR ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) diff --git a/test/lit.common.configured.in b/test/lit.common.configured.in index 472073b31..beecaa258 100644 --- a/test/lit.common.configured.in +++ b/test/lit.common.configured.in @@ -7,10 +7,10 @@ def set_default(attr, value): setattr(config, attr, value) # Generic config options for all compiler-rt lit tests. -set_default("target_triple", "@TARGET_TRIPLE@") +set_default("target_triple", "@COMPILER_RT_TEST_TARGET_TRIPLE@") set_default("target_cflags", "@COMPILER_RT_TEST_COMPILER_CFLAGS@") set_default("host_arch", "@HOST_ARCH@") -set_default("target_arch", "@HOST_ARCH@") +set_default("target_arch", "@COMPILER_RT_TEST_TARGET_ARCH@") set_default("host_os", "@HOST_OS@") set_default("llvm_build_mode", "@LLVM_BUILD_MODE@") set_default("llvm_src_root", "@LLVM_SOURCE_DIR@") diff --git a/test/sanitizer_common/TestCases/Linux/ptrace.cc b/test/sanitizer_common/TestCases/Linux/ptrace.cc index 2c7517551..5b6a3e94a 100644 --- a/test/sanitizer_common/TestCases/Linux/ptrace.cc +++ b/test/sanitizer_common/TestCases/Linux/ptrace.cc @@ -1,4 +1,5 @@ // RUN: %clangxx -O0 %s -o %t && %run %t +// XFAIL: arm #include <assert.h> #include <signal.h> |