sancov test suite

[oota-llvm.git] / tools / sancov / sancov.cc

diff --git a/tools/sancov/sancov.cc b/tools/sancov/sancov.cc
index 7a3d7f171c593f14065084b95fb9ba91ef285e56..9b54575028ad22910a4ec2ba1e305fa49dd4c7a1 100644 (file)
--- a/tools/sancov/sancov.cc
+++ b/tools/sancov/sancov.cc
@@ -178,7 +178,7 @@ class CoverageData {
       return;
     symbolize::LLVMSymbolizer::Options SymbolizerOptions;
     SymbolizerOptions.Demangle = ClDemangle;
-    symbolize::LLVMSymbolizer Symbolizer;
+    symbolize::LLVMSymbolizer Symbolizer(SymbolizerOptions);
 
     struct FileLoc {
       std::string FileName;
@@ -226,8 +226,11 @@ class CoverageData {
         if (!ProcessedFunctions.insert(FunctionName).second)
           continue;
 
-        out << FileName.substr(FilePrefix.size()) << ":" << Line << " "
-            << FunctionName << "\n";
+        // Don't strip prefix if we only have a single file.
+        if (FileName.size() > FilePrefix.size())
+          FileName = FileName.substr(FilePrefix.size());
+
+        out << FileName << ":" << Line << " " << FunctionName << "\n";
       }
     }
   }