<div dir="ltr">Thanks! <div>Since you've removed <span style="font-family:arial,sans-serif;font-size:13px">XFAIL: *</span></div><div><span style="font-family:arial,sans-serif;font-size:13px">the test may now start failing on a 32-bit machine, but that's another story</span></div>
<div><span style="font-family:arial,sans-serif;font-size:13px">(</span><font face="arial, sans-serif"><a href="https://code.google.com/p/address-sanitizer/issues/detail?id=278">https://code.google.com/p/address-sanitizer/issues/detail?id=278</a></font><span style="font-family:arial,sans-serif;font-size:13px">)</span></div>
<br style="font-family:arial,sans-serif;font-size:13px"></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, May 7, 2014 at 11:22 PM, Greg Fitzgerald <span dir="ltr"><<a href="mailto:gregf@codeaurora.org" target="_blank">gregf@codeaurora.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: garious<br>
Date: Wed May 7 14:22:16 2014<br>
New Revision: 208240<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=208240&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=208240&view=rev</a><br>
Log:<br>
[asan] fix i386 tests broken from r207707<br>
<br>
Modified:<br>
compiler-rt/trunk/test/asan/CMakeLists.txt<br>
compiler-rt/trunk/test/asan/TestCases/Linux/kernel-area.cc<br>
compiler-rt/trunk/test/asan/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a><br>
compiler-rt/trunk/test/<a href="http://lit.common.configured.in" target="_blank">lit.common.configured.in</a><br>
<br>
Modified: compiler-rt/trunk/test/asan/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/CMakeLists.txt?rev=208240&r1=208239&r2=208240&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/CMakeLists.txt?rev=208240&r1=208239&r2=208240&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/test/asan/CMakeLists.txt Wed May 7 14:22:16 2014<br>
@@ -9,7 +9,7 @@ if(CAN_TARGET_arm_android)<br>
get_filename_component(ASAN_TEST_LLVM_TOOLS_DIR ${CMAKE_C_COMPILER} PATH)<br>
set(ASAN_TEST_CONFIG_SUFFIX "-arm-android")<br>
set(ASAN_TEST_BITS "32")<br>
- get_target_flags_for_arch(arm_android COMPILER_RT_TEST_COMPILER_CFLAGS)<br>
+ get_target_flags_for_arch(arm_android ASAN_TEST_TARGET_CFLAGS)<br>
configure_lit_site_cfg(<br>
${CMAKE_CURRENT_SOURCE_DIR}/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a><br>
${CMAKE_CURRENT_BINARY_DIR}/ARMAndroidConfig/lit.site.cfg<br>
@@ -21,6 +21,7 @@ if(CAN_TARGET_arm)<br>
# This is only true if we are cross-compiling.<br>
# Build all tests with host compiler and use host tools.<br>
set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})<br>
+ set(ASAN_TEST_TARGET_CFLAGS ${COMPILER_RT_TEST_COMPILER_CFLAGS})<br>
set(ASAN_TEST_CONFIG_SUFFIX "-arm-linux")<br>
set(ASAN_TEST_BITS "32")<br>
set(ASAN_TEST_DYNAMIC False)<br>
@@ -34,7 +35,7 @@ endif()<br>
if(CAN_TARGET_x86_64 OR CAN_TARGET_powerpc64)<br>
set(ASAN_TEST_CONFIG_SUFFIX "64")<br>
set(ASAN_TEST_BITS "64")<br>
- set(COMPILER_RT_TEST_COMPILER_CFLAGS ${TARGET_64_BIT_CFLAGS})<br>
+ set(ASAN_TEST_TARGET_CFLAGS ${TARGET_64_BIT_CFLAGS})<br>
set(ASAN_TEST_DYNAMIC False)<br>
configure_lit_site_cfg(<br>
${CMAKE_CURRENT_SOURCE_DIR}/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a><br>
@@ -54,7 +55,7 @@ endif()<br>
if(CAN_TARGET_i386)<br>
set(ASAN_TEST_CONFIG_SUFFIX "32")<br>
set(ASAN_TEST_BITS "32")<br>
- set(COMPILER_RT_TEST_COMPILER_CFLAGS ${TARGET_32_BIT_CFLAGS})<br>
+ set(ASAN_TEST_TARGET_CFLAGS ${TARGET_32_BIT_CFLAGS})<br>
set(ASAN_TEST_DYNAMIC False)<br>
set(ASAN_TEST_TARGET_ARCH "i386")<br>
configure_lit_site_cfg(<br>
<br>
Modified: compiler-rt/trunk/test/asan/TestCases/Linux/kernel-area.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Linux/kernel-area.cc?rev=208240&r1=208239&r2=208240&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Linux/kernel-area.cc?rev=208240&r1=208239&r2=208240&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/TestCases/Linux/kernel-area.cc (original)<br>
+++ compiler-rt/trunk/test/asan/TestCases/Linux/kernel-area.cc Wed May 7 14:22:16 2014<br>
@@ -12,7 +12,6 @@<br>
// CHECK-kernel-64-bits: || `[0x24000000, 0x27ffffff]` || ShadowGap ||<br>
//<br>
// REQUIRES: asan-32-bits<br>
-// XFAIL: *<br>
<br>
int main() {<br>
return 0;<br>
<br>
Modified: compiler-rt/trunk/test/asan/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/lit.site.cfg.in?rev=208240&r1=208239&r2=208240&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/lit.site.cfg.in?rev=208240&r1=208239&r2=208240&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/asan/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a> (original)<br>
+++ compiler-rt/trunk/test/asan/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a> Wed May 7 14:22:16 2014<br>
@@ -4,6 +4,7 @@<br>
# Tool-specific config options.<br>
config.name_suffix = "@ASAN_TEST_CONFIG_SUFFIX@"<br>
config.asan_lit_source_dir = "@ASAN_LIT_SOURCE_DIR@"<br>
+config.target_cflags = "@ASAN_TEST_TARGET_CFLAGS@"<br>
config.clang = "@ASAN_TEST_TARGET_CC@"<br>
config.llvm_tools_dir = "@ASAN_TEST_LLVM_TOOLS_DIR@"<br>
config.bits = "@ASAN_TEST_BITS@"<br>
<br>
Modified: compiler-rt/trunk/test/<a href="http://lit.common.configured.in" target="_blank">lit.common.configured.in</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lit.common.configured.in?rev=208240&r1=208239&r2=208240&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lit.common.configured.in?rev=208240&r1=208239&r2=208240&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/<a href="http://lit.common.configured.in" target="_blank">lit.common.configured.in</a> (original)<br>
+++ compiler-rt/trunk/test/<a href="http://lit.common.configured.in" target="_blank">lit.common.configured.in</a> Wed May 7 14:22:16 2014<br>
@@ -8,7 +8,7 @@ def set_default(attr, value):<br>
<br>
# Generic config options for all compiler-rt lit tests.<br>
set_default("target_triple", "@TARGET_TRIPLE@")<br>
-set_default("target_cflags", "@COMPILER_RT_TEST_COMPILER_FLAGS@")<br>
+set_default("target_cflags", "@COMPILER_RT_TEST_COMPILER_CFLAGS@")<br>
set_default("host_arch", "@HOST_ARCH@")<br>
set_default("target_arch", "@HOST_ARCH@")<br>
set_default("host_os", "@HOST_OS@")<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>