[compiler-rt] r209256 - XFAIL ptrace test on arm

[Greg Fitzgerald]

Author: garious
Date: Tue May 20 18:31:26 2014
New Revision: 209256

URL: http://llvm.org/viewvc/llvm-project?rev=209256&view=rev
Log:
XFAIL ptrace test on arm

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

Differential Revision: http://reviews.llvm.org/D3855

Modified:
    compiler-rt/trunk/CMakeLists.txt
    compiler-rt/trunk/test/lit.common.configured.in
    compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/ptrace.cc

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=209256&r1=209255&r2=209256&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Tue May 20 18:31:26 2014
@@ -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})

Modified: compiler-rt/trunk/test/lit.common.configured.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lit.common.configured.in?rev=209256&r1=209255&r2=209256&view=diff
==============================================================================
--- compiler-rt/trunk/test/lit.common.configured.in (original)
+++ compiler-rt/trunk/test/lit.common.configured.in Tue May 20 18:31:26 2014
@@ -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@")

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/ptrace.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/ptrace.cc?rev=209256&r1=209255&r2=209256&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/ptrace.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/ptrace.cc Tue May 20 18:31:26 2014
@@ -1,4 +1,5 @@
 // RUN: %clangxx -O0 %s -o %t && %run %t
+// XFAIL: arm
 
 #include <assert.h>
 #include <signal.h>