XFAIL ptrace test on arm

[garious]

Summary

The patch adds better target_triple and target_arch defaults for lit tests,
which allows us to XFAIL tests based on architecture.

Was:

target_triple = LLVM_DEFAULT_TARGET_TRIPLE
target_arch = HOST_ARCH

Now:

target_triple = COMPILER_RT_TEST_TARGET_TRIPLE
              , otherwise LLVM_DEFAULT_TARGET_TRIPLE
target_arch = first item in COMPILER_RT_TEST_TARGET_TRIPLE

[samsonov]

Shouldn't this be called COMPILER_RT_TEST_TARGET_TRIPLE instead?

test/lit.common.configured.in

10 ↗

(On Diff #9644)

Is this actually used anywhere?

[samsonov]

test/lit.common.configured.in

10 ↗

(On Diff #9644)

Ah, disregard this comment. lit uses it to properly understand XFAIL.

[garious]

Shouldn't this be called COMPILER_RT_TEST_TARGET_TRIPLE instead?

Would you prefer I add '_TEST' here? If *_COMPILER_ID==Clang, it's safe to use this value for the -target flag as well. This variable could be a convenient way to mix and match GCC and Clang. We could remove -target from CMAKE_C_FLAGS and COMPILER_RT_TEST_CFLAGS and then automatically add it in whenever *_COMPILER_ID==Clang.

[samsonov]

COMPILER_RT_TARGET_TRIPLE can be confusing at the moment: we're building compiler-rt *libraries* for several targets (e.g. both for x86_64 and i386).

[garious]

Renamed COMPILER_RT_TARGET_TRIPLE to COMPILER_RT_TEST_TARGET_TRIPLE

[samsonov]

LGTM

CMakeLists.txt

144 ↗

(On Diff #9646)

COMPILER_RT_TEST_TARGET_ARCH here as well.

[garious]

Closed by commit rL209256 (authored by @garious).

compiler-rt/trunk/CMakeLists.txt

 if("${COMPILER_RT_TEST_COMPILER}" MATCHES "clang[+]*$")
   set(COMPILER_RT_TEST_COMPILER_ID Clang)
 elseif("${COMPILER_RT_TEST_COMPILER}" MATCHES "clang-cl.exe$")
   set(COMPILER_RT_TEST_COMPILER_ID Clang)
 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})
 set(COMPILER_RT_LIBRARY_INSTALL_DIR
   ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR})
 
 # Add path for custom compiler-rt modules.
 set(CMAKE_MODULE_PATH

compiler-rt/trunk/test/lit.common.configured.in

 ## Autogenerated by LLVM/Clang configuration.
 # Do not edit!
 
 # Set attribute value if it is unset.
 def set_default(attr, value):
   if not getattr(config, attr, None):
     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@")
 set_default("llvm_obj_root", "@LLVM_BINARY_DIR@")
 set_default("compiler_rt_src_root", "@COMPILER_RT_SOURCE_DIR@")
 set_default("compiler_rt_obj_root", "@COMPILER_RT_BINARY_DIR@")
 set_default("llvm_tools_dir", "@LLVM_TOOLS_DIR@")
 set_default("clang", "@COMPILER_RT_TEST_COMPILER@")

compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/ptrace.cc

 // RUN: %clangxx -O0 %s -o %t && %run %t
+// XFAIL: arm
 
 #include <assert.h>
 #include <signal.h>
 #include <stdio.h>
 #include <sys/ptrace.h>
 #include <sys/types.h>
 #include <sys/user.h>
 #include <sys/wait.h>