This is an archive of the discontinued LLVM Phabricator instance.

Differential D28636

[libFuzzer] Fix coverage tests for Windows.
ClosedPublic

Authored by mpividori on Jan 12 2017, 7:41 PM.

Details

Reviewers
kcc
zturner
Commits
rG62c10bf1188d: [libFuzzer] Consider both possible separators for tests.
rL292740: [libFuzzer] Consider both possible separators for tests.
Summary

Consider both possible separators.

Diff Detail

Event Timeline

mpividori updated this revision to Diff 84213.Jan 12 2017, 7:41 PM
mpividori retitled this revision from to [libFuzzer] Fix coverage tests for Windows..
mpividori updated this object.
mpividori added reviewers: kcc, zturner.
mpividori added a subscriber: llvm-commits.
zturner added inline comments.Jan 13 2017, 10:20 AM
lib/Fuzzer/test/coverage.test
6

A couple of alternatives:

  1. Check whether this line would work: CHECK: COVERED_DIRS: %S
  1. Use %{pathsep} instead of the regex. CHECK: COVERED_DIRS: {{.*}}lib%{pathsep}Fuzzer%{pathsep}test

The first would be ideal, but if the output only prints a relative path and not an absolute path, it won't work since %S uses an absolute path.

mpividori added a comment.Jan 13 2017, 1:56 PM

@zturner, Great to know that I can use: %{pathsep} , I looked for something similar in the documentation but I didn't find it. Thanks.

mpividori added inline comments.Jan 17 2017, 8:45 PM
lib/Fuzzer/test/coverage.test
6

@zturner I think we need to use {{[/\\]}}. I see that many tests use that. We can't use %S and %{pathsep}, because they can only be used inside RUN: lines, because they are replaced by lit, not by FileCheck.

zturner accepted this revision.Jan 17 2017, 8:52 PM

Thanks for trying. lgtm

This revision is now accepted and ready to land.Jan 17 2017, 8:52 PM
Closed by commit rL292740: [libFuzzer] Consider both possible separators for tests. (authored by mpividori). · Explain WhyJan 21 2017, 6:09 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Fuzzer/
test/
2 lines

Diff 84213

lib/Fuzzer/test/coverage.test

CHECK: COVERAGE: CHECK: COVERAGE:
CHECK-DAG: COVERED: {{.*}}in LLVMFuzzerTestOneInput {{.*}}NullDerefTest.cpp:13 CHECK-DAG: COVERED: {{.*}}in LLVMFuzzerTestOneInput {{.*}}NullDerefTest.cpp:13
CHECK-DAG: COVERED: {{.*}}in LLVMFuzzerTestOneInput {{.*}}NullDerefTest.cpp:14 CHECK-DAG: COVERED: {{.*}}in LLVMFuzzerTestOneInput {{.*}}NullDerefTest.cpp:14
CHECK-DAG: COVERED: {{.*}}in LLVMFuzzerTestOneInput {{.*}}NullDerefTest.cpp:16 CHECK-DAG: COVERED: {{.*}}in LLVMFuzzerTestOneInput {{.*}}NullDerefTest.cpp:16
CHECK-DAG: COVERED: {{.*}}in LLVMFuzzerTestOneInput {{.*}}NullDerefTest.cpp:19 CHECK-DAG: COVERED: {{.*}}in LLVMFuzzerTestOneInput {{.*}}NullDerefTest.cpp:19
CHECK: COVERED_DIRS: {{.*}}lib/Fuzzer/test CHECK: COVERED_DIRS: {{.*}}lib{{[/\\]}}Fuzzer{{[/\\]}}test
zturnerUnsubmitted
Not Done
ReplyInline Actions

A couple of alternatives:

  1. Check whether this line would work: CHECK: COVERED_DIRS: %S
  1. Use %{pathsep} instead of the regex. CHECK: COVERED_DIRS: {{.*}}lib%{pathsep}Fuzzer%{pathsep}test

The first would be ideal, but if the output only prints a relative path and not an absolute path, it won't work since %S uses an absolute path.

zturner: A couple of alternatives: 1. Check whether this line would work: `CHECK: COVERED_DIRS: %S` 2.
mpividoriAuthorUnsubmitted
Not Done
ReplyInline Actions

@zturner I think we need to use {{[/\\]}}. I see that many tests use that. We can't use %S and %{pathsep}, because they can only be used inside RUN: lines, because they are replaced by lit, not by FileCheck.

mpividori: @zturner I think we need to use `{{[/\\]}}`. I see that many tests use that. We can't use `%S`…
RUN: not LLVMFuzzer-NullDerefTest -print_coverage=1 2>&1 | FileCheck %s RUN: not LLVMFuzzer-NullDerefTest -print_coverage=1 2>&1 | FileCheck %s
RUN: LLVMFuzzer-DSOTest -print_coverage=1 -runs=0 2>&1 | FileCheck %s --check-prefix=DSO RUN: LLVMFuzzer-DSOTest -print_coverage=1 -runs=0 2>&1 | FileCheck %s --check-prefix=DSO
DSO: COVERAGE: DSO: COVERAGE:
DSO-DAG: COVERED:{{.*}}DSO1{{.*}}DSO1.cpp DSO-DAG: COVERED:{{.*}}DSO1{{.*}}DSO1.cpp
DSO-DAG: COVERED:{{.*}}DSO2{{.*}}DSO2.cpp DSO-DAG: COVERED:{{.*}}DSO2{{.*}}DSO2.cpp
DSO-DAG: COVERED:{{.*}}LLVMFuzzerTestOneInput{{.*}}DSOTestMain DSO-DAG: COVERED:{{.*}}LLVMFuzzerTestOneInput{{.*}}DSOTestMain
DSO-DAG: UNCOVERED_LINE:{{.*}}DSO1{{.*}}DSO1.cpp DSO-DAG: UNCOVERED_LINE:{{.*}}DSO1{{.*}}DSO1.cpp
DSO-DAG: UNCOVERED_LINE:{{.*}}DSO2{{.*}}DSO2.cpp DSO-DAG: UNCOVERED_LINE:{{.*}}DSO2{{.*}}DSO2.cpp
DSO-DAG: UNCOVERED_FUNC: in Uncovered1 DSO-DAG: UNCOVERED_FUNC: in Uncovered1
DSO-DAG: UNCOVERED_FUNC: in Uncovered2 DSO-DAG: UNCOVERED_FUNC: in Uncovered2
DSO-DAG: UNCOVERED_LINE: in LLVMFuzzerTestOneInput DSO-DAG: UNCOVERED_LINE: in LLVMFuzzerTestOneInput
DSO-DAG: UNCOVERED_FILE:{{.*}}DSOTestExtra.cpp DSO-DAG: UNCOVERED_FILE:{{.*}}DSOTestExtra.cpp