[compiler-rt] r208240 - [asan] fix i386 tests broken from r207707

[Greg Fitzgerald]

Author: garious
Date: Wed May  7 14:22:16 2014
New Revision: 208240

URL: http://llvm.org/viewvc/llvm-project?rev=208240&view=rev
Log:
[asan] fix i386 tests broken from r207707

Modified:
    compiler-rt/trunk/test/asan/CMakeLists.txt
    compiler-rt/trunk/test/asan/TestCases/Linux/kernel-area.cc
    compiler-rt/trunk/test/asan/lit.site.cfg.in
    compiler-rt/trunk/test/lit.common.configured.in

Modified: compiler-rt/trunk/test/asan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/CMakeLists.txt?rev=208240&r1=208239&r2=208240&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/asan/CMakeLists.txt Wed May  7 14:22:16 2014
@@ -9,7 +9,7 @@ if(CAN_TARGET_arm_android)
   get_filename_component(ASAN_TEST_LLVM_TOOLS_DIR ${CMAKE_C_COMPILER} PATH)
   set(ASAN_TEST_CONFIG_SUFFIX "-arm-android")
   set(ASAN_TEST_BITS "32")
-  get_target_flags_for_arch(arm_android COMPILER_RT_TEST_COMPILER_CFLAGS)
+  get_target_flags_for_arch(arm_android ASAN_TEST_TARGET_CFLAGS)
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
     ${CMAKE_CURRENT_BINARY_DIR}/ARMAndroidConfig/lit.site.cfg
@@ -21,6 +21,7 @@ if(CAN_TARGET_arm)
   # This is only true if we are cross-compiling.
   # Build all tests with host compiler and use host tools.
   set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})
+  set(ASAN_TEST_TARGET_CFLAGS ${COMPILER_RT_TEST_COMPILER_CFLAGS})
   set(ASAN_TEST_CONFIG_SUFFIX "-arm-linux")
   set(ASAN_TEST_BITS "32")
   set(ASAN_TEST_DYNAMIC False)
@@ -34,7 +35,7 @@ endif()
 if(CAN_TARGET_x86_64 OR CAN_TARGET_powerpc64)
   set(ASAN_TEST_CONFIG_SUFFIX "64")
   set(ASAN_TEST_BITS "64")
-  set(COMPILER_RT_TEST_COMPILER_CFLAGS ${TARGET_64_BIT_CFLAGS})
+  set(ASAN_TEST_TARGET_CFLAGS ${TARGET_64_BIT_CFLAGS})
   set(ASAN_TEST_DYNAMIC False)
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
@@ -54,7 +55,7 @@ endif()
 if(CAN_TARGET_i386)
   set(ASAN_TEST_CONFIG_SUFFIX "32")
   set(ASAN_TEST_BITS "32")
-  set(COMPILER_RT_TEST_COMPILER_CFLAGS ${TARGET_32_BIT_CFLAGS})
+  set(ASAN_TEST_TARGET_CFLAGS ${TARGET_32_BIT_CFLAGS})
   set(ASAN_TEST_DYNAMIC False)
   set(ASAN_TEST_TARGET_ARCH "i386")
   configure_lit_site_cfg(

Modified: compiler-rt/trunk/test/asan/TestCases/Linux/kernel-area.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Linux/kernel-area.cc?rev=208240&r1=208239&r2=208240&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Linux/kernel-area.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Linux/kernel-area.cc Wed May  7 14:22:16 2014
@@ -12,7 +12,6 @@
 // CHECK-kernel-64-bits: || `[0x24000000, 0x27ffffff]` || ShadowGap  ||
 //
 // REQUIRES: asan-32-bits
-// XFAIL: *
 
 int main() {
   return 0;

Modified: compiler-rt/trunk/test/asan/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/lit.site.cfg.in?rev=208240&r1=208239&r2=208240&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/lit.site.cfg.in (original)
+++ compiler-rt/trunk/test/asan/lit.site.cfg.in Wed May  7 14:22:16 2014
@@ -4,6 +4,7 @@
 # Tool-specific config options.
 config.name_suffix = "@ASAN_TEST_CONFIG_SUFFIX@"
 config.asan_lit_source_dir = "@ASAN_LIT_SOURCE_DIR@"
+config.target_cflags = "@ASAN_TEST_TARGET_CFLAGS@"
 config.clang = "@ASAN_TEST_TARGET_CC@"
 config.llvm_tools_dir = "@ASAN_TEST_LLVM_TOOLS_DIR@"
 config.bits = "@ASAN_TEST_BITS@"

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=208240&r1=208239&r2=208240&view=diff
==============================================================================
--- compiler-rt/trunk/test/lit.common.configured.in (original)
+++ compiler-rt/trunk/test/lit.common.configured.in Wed May  7 14:22:16 2014
@@ -8,7 +8,7 @@ def set_default(attr, value):
     
 # Generic config options for all compiler-rt lit tests.
 set_default("target_triple", "@TARGET_TRIPLE@")
-set_default("target_cflags", "@COMPILER_RT_TEST_COMPILER_FLAGS@")
+set_default("target_cflags", "@COMPILER_RT_TEST_COMPILER_CFLAGS@")
 set_default("host_arch", "@HOST_ARCH@")
 set_default("target_arch", "@HOST_ARCH@")
 set_default("host_os", "@HOST_OS@")