summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2017-10-11 00:32:03 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2017-10-11 00:32:03 +0000
commit922973a46644b6bd1f86780f3cd36d79c5ef2003 (patch)
tree4b4faeb0fe9d610eb3a84a7d235b828f2c73fee6
parent6ce20bd184e6684fb96d643bd4b113d0eb9f0d21 (diff)
downloadbcm5719-llvm-922973a46644b6bd1f86780f3cd36d79c5ef2003.tar.gz
bcm5719-llvm-922973a46644b6bd1f86780f3cd36d79c5ef2003.zip
[sanitizer] Re-disable several tests on Android.
The tests have been enabled by accident in r315389. llvm-svn: 315396
-rw-r--r--compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc2
-rw-r--r--compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cc2
-rw-r--r--compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cc2
-rw-r--r--compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cc2
-rw-r--r--compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cc2
-rw-r--r--compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cc2
6 files changed, 6 insertions, 6 deletions
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc
index a690193bd7b..8a05f4b6686 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc
@@ -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-target-arch && asan
+// XFAIL: android && asan
#include <errno.h>
#include <fcntl.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cc
index 59919a1ae87..b91a3d7d526 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cc
@@ -1,7 +1,7 @@
// RUN: %clangxx -O0 -g %s -lutil -o %t && %run %t | FileCheck %s
// REQUIRES: stable-runtime
-// XFAIL: android && i386-target-arch && asan
+// XFAIL: android && asan
#include <assert.h>
#include <stdio.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cc
index 416944fa6d1..baa1d9a64d3 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cc
@@ -5,7 +5,7 @@
// RUN: not %run %t %t-out && FileCheck < %t-out %s
// REQUIRES: stable-runtime
-// XFAIL: android && i386-target-arch && asan
+// XFAIL: android && asan
// FIXME: implement SEGV handler in other sanitizers, not just asan.
// XFAIL: msan
// XFAIL: tsan
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cc b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cc
index b90c93fb380..9604da222f8 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cc
@@ -3,7 +3,7 @@
// REQUIRES: has_sancovcc,stable-runtime
// UNSUPPORTED: i386-darwin
// XFAIL: ubsan,tsan
-// XFAIL: android && i386-target-arch && asan
+// XFAIL: android && 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
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cc b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cc
index db1d94e82a7..7a2eca8bcd9 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cc
@@ -3,7 +3,7 @@
// REQUIRES: has_sancovcc,stable-runtime
// UNSUPPORTED: ubsan
// XFAIL: tsan,darwin,powerpc64,s390x,mips
-// XFAIL: android && i386-target-arch && asan
+// XFAIL: android && asan
// RUN: DIR=%t_workdir
// RUN: CLANG_ARGS="-O0 -fsanitize-coverage=trace-pc-guard"
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cc b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cc
index cfcb242ca5e..1adbf653bb7 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cc
@@ -3,7 +3,7 @@
// REQUIRES: has_sancovcc,stable-runtime
// UNSUPPORTED: ubsan,i386-darwin
// XFAIL: tsan,powerpc64,s390x,mips
-// XFAIL: android && i386-target-arch && asan
+// XFAIL: android && asan
// RUN: DIR=%t_workdir
// RUN: rm -rf $DIR
OpenPOWER on IntegriCloud