7 files changed, 5 insertions, 10 deletions
diff --git a/llvm/test/tools/sancov/blacklist.test b/llvm/test/tools/sancov/blacklist.test
index 65ed25b2c28..6af1799a481 100644
--- a/llvm/test/tools/sancov/blacklist.test
+++ b/llvm/test/tools/sancov/blacklist.test
@@ -1,7 +1,4 @@
-FIXME: sancov relies on __cxa_demangle for demangling. Remove this when LLVM has
-its own demangler.
 REQUIRES: x86_64-linux
-
 RUN: sancov -covered-functions -blacklist %p/Inputs/fun_blacklist.txt %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
 RUN: sancov -covered-functions -blacklist %p/Inputs/src_blacklist.txt %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.1.sancov | FileCheck --check-prefix=CHECK1 %s
 
diff --git a/llvm/test/tools/sancov/covered_functions.test b/llvm/test/tools/sancov/covered_functions.test
index e94c30ce69a..8126049a0ca 100644
--- a/llvm/test/tools/sancov/covered_functions.test
+++ b/llvm/test/tools/sancov/covered_functions.test
@@ -1,7 +1,4 @@
-FIXME: sancov relies on __cxa_demangle for demangling. Remove this when LLVM has
-its own demangler.
 REQUIRES: x86_64-linux
-
 RUN: sancov -covered-functions %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
 RUN: sancov -covered-functions -strip_path_prefix=Inputs/ %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck --check-prefix=STRIP_PATH %s
 RUN: sancov -demangle=0 -covered-functions %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck --check-prefix=NO_DEMANGLE %s
diff --git a/llvm/test/tools/sancov/html-report.test b/llvm/test/tools/sancov/html-report.test
index 29b92386c13..a50c8fba742 100644
--- a/llvm/test/tools/sancov/html-report.test
+++ b/llvm/test/tools/sancov/html-report.test
@@ -1,5 +1,6 @@
+REQUIRES: x86_64-linux
 RUN: sancov -html-report %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
 
 // It's very difficult to test html report. Do basic smoke check.
-CHECK: {{.*[/\\]Inputs[/\\]test.cpp}}
+CHECK: {{.*/Inputs/test.cpp}}
 
diff --git a/llvm/test/tools/sancov/not_covered_functions.test b/llvm/test/tools/sancov/not_covered_functions.test
index e69d46645ec..77f0e6bd8dd 100644
--- a/llvm/test/tools/sancov/not_covered_functions.test
+++ b/llvm/test/tools/sancov/not_covered_functions.test
@@ -1,7 +1,4 @@
-FIXME: sancov relies on __cxa_demangle for demangling. Remove this when LLVM has
-its own demangler.
 REQUIRES: x86_64-linux
-
 RUN: sancov -not-covered-functions %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
 RUN: sancov -not-covered-functions %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.1.sancov | FileCheck --check-prefix=CHECK1 --allow-empty %s
 
diff --git a/llvm/test/tools/sancov/print.test b/llvm/test/tools/sancov/print.test
index 24ebb244b3e..fe94216b051 100644
--- a/llvm/test/tools/sancov/print.test
+++ b/llvm/test/tools/sancov/print.test
@@ -1,3 +1,4 @@
+REQUIRES: x86_64-linux
 RUN: sancov -print %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
 
 CHECK: 0x4e132b
diff --git a/llvm/test/tools/sancov/print_coverage_pcs.test b/llvm/test/tools/sancov/print_coverage_pcs.test
index 3a54f97d7b4..2756eb03ba0 100644
--- a/llvm/test/tools/sancov/print_coverage_pcs.test
+++ b/llvm/test/tools/sancov/print_coverage_pcs.test
@@ -1,3 +1,4 @@
+REQUIRES: x86_64-linux
 RUN: sancov -print-coverage-pcs %p/Inputs/test-linux_x86_64 | FileCheck %s
 
 CHECK: 0x4e132b
diff --git a/llvm/test/tools/sancov/stats.test b/llvm/test/tools/sancov/stats.test
index d5b4c9beb1b..05e712b0bde 100644
--- a/llvm/test/tools/sancov/stats.test
+++ b/llvm/test/tools/sancov/stats.test
@@ -1,3 +1,4 @@
+REQUIRES: x86_64-linux
 RUN: sancov -print-coverage-stats %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
 
 CHECK: all-edges: 9