[compiler-rt] r313452 - [sanitizer] Fix check for i386 Android in lit tests

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Sat Sep 16 00:56:06 2017
New Revision: 313452

URL: http://llvm.org/viewvc/llvm-project?rev=313452&view=rev
Log:
[sanitizer] Fix check for i386 Android in lit tests

Modified:
    compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc
    compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/getpass.cc
    compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cc
    compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cc
    compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cc
    compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cc

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc?rev=313452&r1=313451&r2=313452&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc Sat Sep 16 00:56:06 2017
@@ -2,7 +2,7 @@
 // RUN: %env_tool_opts=decorate_proc_maps=1 %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-%tool_name
 
 // REQUIRES: stable-runtime
-// XFAIL: android && i386 && asan
+// XFAIL: android && i386-target-arch && asan
 
 #include <errno.h>
 #include <fcntl.h>

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/getpass.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/getpass.cc?rev=313452&r1=313451&r2=313452&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/getpass.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/getpass.cc Sat Sep 16 00:56:06 2017
@@ -1,7 +1,7 @@
 // RUN: %clangxx -O0 -g %s -lutil -o %t && %run %t | FileCheck %s
 
 // REQUIRES: stable-runtime
-// XFAIL: android && i386 && asan
+// XFAIL: android && i386-target-arch && asan
 
 #include <assert.h>
 #include <stdio.h>

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cc?rev=313452&r1=313451&r2=313452&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cc Sat Sep 16 00:56:06 2017
@@ -5,7 +5,7 @@
 // RUN: not %run %t %t-out && FileCheck < %t-out %s
 
 // REQUIRES: stable-runtime
-// XFAIL: android && i386 && asan
+// XFAIL: android && i386-target-arch && asan
 // FIXME: implement SEGV handler in other sanitizers, not just asan.
 // XFAIL: msan
 // XFAIL: lsan

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cc?rev=313452&r1=313451&r2=313452&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cc Sat Sep 16 00:56:06 2017
@@ -3,7 +3,7 @@
 // REQUIRES: has_sancovcc,stable-runtime
 // UNSUPPORTED: i386-darwin
 // XFAIL: ubsan,tsan
-// XFAIL: android && i386 && asan
+// XFAIL: android && i386-target-arch && asan
 
 // RUN: %clangxx -O0 %s -S -o - -emit-llvm -fsanitize-coverage=trace-pc,bb,no-prune 2>&1 | grep "call void @__sanitizer_cov_trace_pc" | count 3
 // RUN: %clangxx -O0 %s -S -o - -emit-llvm -fsanitize-coverage=trace-pc,bb          2>&1 | grep "call void @__sanitizer_cov_trace_pc" | count 2

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cc?rev=313452&r1=313451&r2=313452&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cc Sat Sep 16 00:56:06 2017
@@ -3,7 +3,7 @@
 // REQUIRES: has_sancovcc,stable-runtime
 // UNSUPPORTED: ubsan
 // XFAIL: tsan,darwin,powerpc64,s390x,mips
-// XFAIL: android && i386 && asan
+// XFAIL: android && i386-target-arch && asan
 
 // RUN: DIR=%t_workdir
 // RUN: CLANG_ARGS="-O0 -fsanitize-coverage=trace-pc-guard"

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cc?rev=313452&r1=313451&r2=313452&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cc Sat Sep 16 00:56:06 2017
@@ -3,7 +3,7 @@
 // REQUIRES: has_sancovcc,stable-runtime
 // UNSUPPORTED: ubsan,i386-darwin
 // XFAIL: tsan,powerpc64,s390x,mips
-// XFAIL: android && i386 && asan
+// XFAIL: android && i386-target-arch && asan
 
 // RUN: DIR=%t_workdir
 // RUN: rm -rf $DIR