[llvm] r374629 - [sancov] Accommodate sancov and coverage report server for use under Windows
Vitaly Buka via llvm-commits
llvm-commits at lists.llvm.org
Fri Oct 11 19:29:26 PDT 2019
Author: vitalybuka
Date: Fri Oct 11 19:29:26 2019
New Revision: 374629
URL: http://llvm.org/viewvc/llvm-project?rev=374629&view=rev
Log:
[sancov] Accommodate sancov and coverage report server for use under Windows
Summary:
This patch makes the following changes to SanCov and its complementary Python script in order to resolve issues pertaining to non-UNIX file paths in JSON symbolization information:
* Convert all paths to use forward slash.
* Update `coverage-report-server.py` to correctly handle paths to sources which contain spaces.
* Remove Linux platform restriction for all SanCov unit tests. All SanCov tests passed when ran on my local Windows machine.
Patch by Douglas Gliner.
Reviewers: kcc, filcab, phosek, morehouse, vitalybuka, metzman
Reviewed By: vitalybuka
Subscribers: vsk, Dor1s, llvm-commits
Tags: #sanitizers, #llvm
Differential Revision: https://reviews.llvm.org/D51018
Modified:
llvm/trunk/test/tools/sancov/blacklist.test
llvm/trunk/test/tools/sancov/covered_functions.test
llvm/trunk/test/tools/sancov/merge.test
llvm/trunk/test/tools/sancov/not_covered_functions.test
llvm/trunk/test/tools/sancov/print.test
llvm/trunk/test/tools/sancov/stats.test
llvm/trunk/test/tools/sancov/symbolize.test
llvm/trunk/test/tools/sancov/symbolize_noskip_dead_files.test
llvm/trunk/test/tools/sancov/validation.test
llvm/trunk/tools/sancov/coverage-report-server.py
llvm/trunk/tools/sancov/sancov.cpp
Modified: llvm/trunk/test/tools/sancov/blacklist.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/sancov/blacklist.test?rev=374629&r1=374628&r2=374629&view=diff
==============================================================================
--- llvm/trunk/test/tools/sancov/blacklist.test (original)
+++ llvm/trunk/test/tools/sancov/blacklist.test Fri Oct 11 19:29:26 2019
@@ -1,4 +1,4 @@
-REQUIRES: x86_64-linux
+REQUIRES: x86-registered-target
RUN: sancov -covered-functions %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s --check-prefix=ALL
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
Modified: llvm/trunk/test/tools/sancov/covered_functions.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/sancov/covered_functions.test?rev=374629&r1=374628&r2=374629&view=diff
==============================================================================
--- llvm/trunk/test/tools/sancov/covered_functions.test (original)
+++ llvm/trunk/test/tools/sancov/covered_functions.test Fri Oct 11 19:29:26 2019
@@ -1,4 +1,4 @@
-REQUIRES: x86_64-linux
+REQUIRES: x86-registered-target
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
Modified: llvm/trunk/test/tools/sancov/merge.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/sancov/merge.test?rev=374629&r1=374628&r2=374629&view=diff
==============================================================================
--- llvm/trunk/test/tools/sancov/merge.test (original)
+++ llvm/trunk/test/tools/sancov/merge.test Fri Oct 11 19:29:26 2019
@@ -1,4 +1,4 @@
-REQUIRES: x86_64-linux
+REQUIRES: x86-registered-target
RUN: sancov -merge %p/Inputs/test-linux_x86_64.0.symcov| FileCheck --check-prefix=MERGE1 %s
RUN: sancov -merge %p/Inputs/test-linux_x86_64.0.symcov %p/Inputs/test-linux_x86_64.1.symcov| FileCheck --check-prefix=MERGE2 %s
Modified: llvm/trunk/test/tools/sancov/not_covered_functions.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/sancov/not_covered_functions.test?rev=374629&r1=374628&r2=374629&view=diff
==============================================================================
--- llvm/trunk/test/tools/sancov/not_covered_functions.test (original)
+++ llvm/trunk/test/tools/sancov/not_covered_functions.test Fri Oct 11 19:29:26 2019
@@ -1,4 +1,4 @@
-REQUIRES: x86_64-linux
+REQUIRES: x86-registered-target
RUN: sancov -skip-dead-files=0 -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
Modified: llvm/trunk/test/tools/sancov/print.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/sancov/print.test?rev=374629&r1=374628&r2=374629&view=diff
==============================================================================
--- llvm/trunk/test/tools/sancov/print.test (original)
+++ llvm/trunk/test/tools/sancov/print.test Fri Oct 11 19:29:26 2019
@@ -1,4 +1,4 @@
-REQUIRES: x86_64-linux
+REQUIRES: x86-registered-target
RUN: sancov -print %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
CHECK: 0x4e132b
Modified: llvm/trunk/test/tools/sancov/stats.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/sancov/stats.test?rev=374629&r1=374628&r2=374629&view=diff
==============================================================================
--- llvm/trunk/test/tools/sancov/stats.test (original)
+++ llvm/trunk/test/tools/sancov/stats.test Fri Oct 11 19:29:26 2019
@@ -1,4 +1,4 @@
-REQUIRES: x86_64-linux
+REQUIRES: x86-registered-target
RUN: sancov -print-coverage-stats %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
CHECK: all-edges: 8
Modified: llvm/trunk/test/tools/sancov/symbolize.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/sancov/symbolize.test?rev=374629&r1=374628&r2=374629&view=diff
==============================================================================
--- llvm/trunk/test/tools/sancov/symbolize.test (original)
+++ llvm/trunk/test/tools/sancov/symbolize.test Fri Oct 11 19:29:26 2019
@@ -1,5 +1,6 @@
-REQUIRES: x86_64-linux
-RUN: sancov -symbolize -strip_path_prefix="llvm/" %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
+REQUIRES: x86-registered-target
+RUN: sancov -symbolize -strip_path_prefix="llvm/" %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s --check-prefixes=CHECK,STRIP
+RUN: sancov -symbolize %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s --check-prefixes=CHECK,NOSTRIP
CHECK: {
CHECK-NEXT: "covered-points": [
@@ -11,7 +12,8 @@ CHECK-NEXT: "4e1586"
CHECK-NEXT: ],
CHECK-NEXT: "binary-hash": "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5",
CHECK-NEXT: "point-symbol-info": {
-CHECK-NEXT: "test/tools/sancov/Inputs/test.cpp": {
+STRIP-NEXT: "test/tools/sancov/Inputs/test.cpp": {
+NOSTRIP-NEXT: "/usr/local/google/home/aizatsky/src/llvm/test/tools/sancov/Inputs/test.cpp": {
CHECK-NEXT: "bar(std::string)": {
CHECK-NEXT: "4e132b": "12:0"
CHECK-NEXT: },
Modified: llvm/trunk/test/tools/sancov/symbolize_noskip_dead_files.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/sancov/symbolize_noskip_dead_files.test?rev=374629&r1=374628&r2=374629&view=diff
==============================================================================
--- llvm/trunk/test/tools/sancov/symbolize_noskip_dead_files.test (original)
+++ llvm/trunk/test/tools/sancov/symbolize_noskip_dead_files.test Fri Oct 11 19:29:26 2019
@@ -1,4 +1,4 @@
-REQUIRES: x86_64-linux
+REQUIRES: x86-registered-target
RUN: sancov -symbolize -skip-dead-files=0 -strip_path_prefix="llvm/" %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
CHECK: {
Modified: llvm/trunk/test/tools/sancov/validation.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/sancov/validation.test?rev=374629&r1=374628&r2=374629&view=diff
==============================================================================
--- llvm/trunk/test/tools/sancov/validation.test (original)
+++ llvm/trunk/test/tools/sancov/validation.test Fri Oct 11 19:29:26 2019
@@ -1,4 +1,4 @@
-REQUIRES: x86_64-linux
+REQUIRES: x86-registered-target
RUN: not sancov -covered-functions %p/Inputs/test-linux_x86_64 2>&1 | FileCheck --check-prefix=NOCFILE %s
NOCFILE: WARNING: No coverage file for {{.*}}test-linux_x86_64
Modified: llvm/trunk/tools/sancov/coverage-report-server.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/sancov/coverage-report-server.py?rev=374629&r1=374628&r2=374629&view=diff
==============================================================================
--- llvm/trunk/tools/sancov/coverage-report-server.py (original)
+++ llvm/trunk/tools/sancov/coverage-report-server.py Fri Oct 11 19:29:26 2019
@@ -32,6 +32,7 @@ import html
import os
import string
import math
+import urllib
INDEX_PAGE_TMPL = """
<html>
@@ -128,6 +129,7 @@ class ServerHandler(http.server.BaseHTTP
src_path = None
def do_GET(self):
+ norm_path = os.path.normpath(urllib.parse.unquote(self.path[1:]))
if self.path == '/':
self.send_response(200)
self.send_header("Content-type", "text/html; charset=utf-8")
@@ -147,8 +149,8 @@ class ServerHandler(http.server.BaseHTTP
response = string.Template(INDEX_PAGE_TMPL).safe_substitute(
filenames='\n'.join(filelist))
self.wfile.write(response.encode('UTF-8', 'replace'))
- elif self.symcov_data.has_file(self.path[1:]):
- filename = self.path[1:]
+ elif self.symcov_data.has_file(norm_path):
+ filename = norm_path
filepath = os.path.join(self.src_path, filename)
if not os.path.exists(filepath):
self.send_response(404)
Modified: llvm/trunk/tools/sancov/sancov.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/sancov/sancov.cpp?rev=374629&r1=374628&r2=374629&view=diff
==============================================================================
--- llvm/trunk/tools/sancov/sancov.cpp (original)
+++ llvm/trunk/tools/sancov/sancov.cpp Fri Oct 11 19:29:26 2019
@@ -469,7 +469,7 @@ static std::unique_ptr<symbolize::LLVMSy
static std::string normalizeFilename(const std::string &FileName) {
SmallString<256> S(FileName);
sys::path::remove_dots(S, /* remove_dot_dot */ true);
- return stripPathPrefix(S.str().str());
+ return stripPathPrefix(sys::path::convert_to_slash(S.str()));
}
class Blacklists {
More information about the llvm-commits
mailing list