Index: llvm/trunk/test/lit.cfg
===================================================================
--- llvm/trunk/test/lit.cfg
+++ llvm/trunk/test/lit.cfg
@@ -275,6 +275,7 @@
                 NOJUNK + r"\bopt\b",
                 r"\bFileCheck\b",
                 r"\bobj2yaml\b",
+                NOJUNK + r"\bsancov\b",
                 r"\byaml2obj\b",
                 r"\byaml-bench\b",
                 r"\bverify-uselistorder\b",
@@ -358,6 +359,8 @@
 # Some tests are "generic" and require a valid default triple
 if config.target_triple:
     config.available_features.add("default_triple")
+    if re.match(r'^x86_64.*-linux', config.target_triple):
+      config.available_features.add("x86_64-linux")
 
 # Native compilation: host arch == default triple arch
 # FIXME: Consider cases that target can be executed
Index: llvm/trunk/test/tools/sancov/covered_functions._test
===================================================================
--- llvm/trunk/test/tools/sancov/covered_functions._test
+++ llvm/trunk/test/tools/sancov/covered_functions._test
@@ -1,13 +0,0 @@
-RUN: sancov -obj %p/Inputs/test-linux_x86_64 -covered_functions %p/Inputs/test-linux_x86_64.sancov | FileCheck %s
-RUN: sancov -obj %p/Inputs/test-linux_x86_64 -covered_functions %p/Inputs/test-linux_x86_64-1.sancov | FileCheck --check-prefix=MULTIPLE_FILES %s
-RUN: sancov -obj %p/Inputs/test-linux_x86_64 -demangle=0 -covered_functions %p/Inputs/test-linux_x86_64.sancov | FileCheck --check-prefix=NO_DEMANGLE %s
-
-CHECK: Inputs{{[/\\]}}test.cpp:12 bar(std::string)
-CHECK: Inputs{{[/\\]}}test.cpp:14 main
-
-MULTIPLE_FILES: {{^}}foo.cpp:5 foo()
-MULTIPLE_FILES: {{^}}test.cpp:12 bar(std::string)
-MULTIPLE_FILES: {{^}}test.cpp:14 main
-
-NO_DEMANGLE: test.cpp:12 _Z3barSs
-NO_DEMANGLE: test.cpp:14 main
Index: llvm/trunk/test/tools/sancov/covered_functions.test
===================================================================
--- llvm/trunk/test/tools/sancov/covered_functions.test
+++ llvm/trunk/test/tools/sancov/covered_functions.test
@@ -0,0 +1,14 @@
+REQUIRES: x86_64-linux
+RUN: sancov -obj %p/Inputs/test-linux_x86_64 -covered_functions %p/Inputs/test-linux_x86_64.sancov | FileCheck %s
+RUN: sancov -obj %p/Inputs/test-linux_x86_64 -covered_functions %p/Inputs/test-linux_x86_64-1.sancov | FileCheck --check-prefix=MULTIPLE_FILES %s
+RUN: sancov -obj %p/Inputs/test-linux_x86_64 -demangle=0 -covered_functions %p/Inputs/test-linux_x86_64.sancov | FileCheck --check-prefix=NO_DEMANGLE %s
+
+CHECK: Inputs{{[/\\]}}test.cpp:12 bar(std::string)
+CHECK: Inputs{{[/\\]}}test.cpp:14 main
+
+MULTIPLE_FILES: {{^}}foo.cpp:5 foo()
+MULTIPLE_FILES: {{^}}test.cpp:12 bar(std::string)
+MULTIPLE_FILES: {{^}}test.cpp:14 main
+
+NO_DEMANGLE: test.cpp:12 _Z3barSs
+NO_DEMANGLE: test.cpp:14 main
Index: llvm/trunk/test/tools/sancov/print._test
===================================================================
--- llvm/trunk/test/tools/sancov/print._test
+++ llvm/trunk/test/tools/sancov/print._test
@@ -1,10 +0,0 @@
-RUN: sancov -obj %p/Inputs/test-linux_x86_64 -print %p/Inputs/test-linux_x86_64.sancov | FileCheck %s
-
-CHECK: 0x4db18b
-CHECK: 0x4db2d2
-CHECK: 0x4db322
-CHECK: 0x4db376
-CHECK: 0x4db3bd
-CHECK: 0x4db3f4
-CHECK: 0x4db427
-CHECK: 0x4db45a
Index: llvm/trunk/test/tools/sancov/print.test
===================================================================
--- llvm/trunk/test/tools/sancov/print.test
+++ llvm/trunk/test/tools/sancov/print.test
@@ -0,0 +1,11 @@
+REQUIRES: x86_64-linux
+RUN: sancov -obj %p/Inputs/test-linux_x86_64 -print %p/Inputs/test-linux_x86_64.sancov | FileCheck %s
+
+CHECK: 0x4db18b
+CHECK: 0x4db2d2
+CHECK: 0x4db322
+CHECK: 0x4db376
+CHECK: 0x4db3bd
+CHECK: 0x4db3f4
+CHECK: 0x4db427
+CHECK: 0x4db45a