This is an archive of the discontinued LLVM Phabricator instance.

Differential D90423

[llvm-cov][NFC] Remove unused prefixes from FileCheck usage
ClosedPublic

Authored by keith on Oct 29 2020, 1:54 PM.

Details

Reviewers
vsk
Commits
rGe7ada98b56da: [llvm-cov][NFC] Remove unused prefixes from FileCheck usage
Summary

This is to enable --allow-unused-duplicates=false. These prefixes
appear to be outdated and intentionally unused.

Diff Detail

Event Timeline

keith created this revision.Oct 29 2020, 1:54 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 29 2020, 1:54 PM
keith requested review of this revision.Oct 29 2020, 1:54 PM
keith added a reviewer: vsk.Oct 29 2020, 1:58 PM
keith retitled this revision from [llvm-cov] Remove unused prefixes from FileCheck usage to [llvm-cov][NFC] Remove unused prefixes from FileCheck usage.Oct 29 2020, 2:01 PM
Harbormaster completed remote builds in B76973: Diff 301742.Oct 29 2020, 2:12 PM
vsk accepted this revision.Oct 29 2020, 3:07 PM

Thanks, lgtm!

This revision is now accepted and ready to land.Oct 29 2020, 3:07 PM
keith added a comment.Oct 29 2020, 3:17 PM

Thanks! I don't have merge access do you mind helping me land this?

This revision was landed with ongoing or failed builds.Oct 30 2020, 8:28 AM
Closed by commit rGe7ada98b56da: [llvm-cov][NFC] Remove unused prefixes from FileCheck usage (authored by keith). · Explain Why
This revision was automatically updated to reflect the committed changes.
keith added a commit: rGe7ada98b56da: [llvm-cov][NFC] Remove unused prefixes from FileCheck usage.

Revision Contents

PathSize
llvm/
test/
tools/
llvm-cov/
4 lines
8 lines

Diff 301908

llvm/test/tools/llvm-cov/showHighlightedRanges.cpp

// RUN: llvm-cov show %S/Inputs/highlightedRanges.covmapping -instr-profile %S/Inputs/highlightedRanges.profdata -dump -path-equivalence=/tmp,%S %s 2>&1 | FileCheck %s -check-prefixes=TEXT,SHARED // RUN: llvm-cov show %S/Inputs/highlightedRanges.covmapping -instr-profile %S/Inputs/highlightedRanges.profdata -dump -path-equivalence=/tmp,%S %s 2>&1 | FileCheck %s -check-prefixes=SHARED
void func() { void func() {
return; return;
int i = 0; // SHARED: Highlighted line [[@LINE]], 3 -> int i = 0; // SHARED: Highlighted line [[@LINE]], 3 ->
} // SHARED: Highlighted line [[@LINE]], 1 -> 2 } // SHARED: Highlighted line [[@LINE]], 1 -> 2
void func2(int x) { void func2(int x) {
if(x > 5) { if(x > 5) {
Show All 29 Lines
int main() { int main() {
test(); test();
func(); func();
func2(9); func2(9);
return 0; return 0;
} }
// RUN: llvm-cov show %S/Inputs/highlightedRanges.covmapping -instr-profile %S/Inputs/highlightedRanges.profdata -format html -dump -path-equivalence=/tmp,%S %s 2>&1 | FileCheck %s -check-prefixes=HTML,SHARED // RUN: llvm-cov show %S/Inputs/highlightedRanges.covmapping -instr-profile %S/Inputs/highlightedRanges.profdata -format html -dump -path-equivalence=/tmp,%S %s 2>&1 | FileCheck %s -check-prefixes=SHARED

llvm/test/tools/llvm-cov/showProjectSummary.cpp

// RUN: llvm-profdata merge -o %t.profdata %S/Inputs/showProjectSummary.proftext // RUN: llvm-profdata merge -o %t.profdata %S/Inputs/showProjectSummary.proftext
int main(int argc, char ** argv) { int main(int argc, char ** argv) {
int x=0; int x=0;
for (int i = 0; i < 20; ++i) for (int i = 0; i < 20; ++i)
x *= 2; x *= 2;
if (x >= 100) if (x >= 100)
x = x / 2; x = x / 2;
else else
x = x * 2; x = x * 2;
return x; return x;
} }
// Test console output. // Test console output.
// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -path-equivalence=/tmp,%S %s | FileCheck -check-prefixes=TEXT,TEXT-FILE,TEXT-HEADER %S/Inputs/showProjectSummary.test // RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -path-equivalence=/tmp,%S %s | FileCheck -check-prefixes=TEXT %S/Inputs/showProjectSummary.test
// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -path-equivalence=/tmp,%S -name=main %s | FileCheck -check-prefixes=TEXT,TEXT-FILE,TEXT-HEADER %S/Inputs/showProjectSummary.test // RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -path-equivalence=/tmp,%S -name=main %s | FileCheck -check-prefixes=TEXT %S/Inputs/showProjectSummary.test
// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -project-title "Test Suite" -path-equivalence=/tmp,%S %s | FileCheck -check-prefixes=TEXT-TITLE,TEXT,TEXT-FILE,TEXT-HEADER %S/Inputs/showProjectSummary.test // RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -project-title "Test Suite" -path-equivalence=/tmp,%S %s | FileCheck -check-prefixes=TEXT-TITLE,TEXT %S/Inputs/showProjectSummary.test
// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -project-title "Test Suite" -name=main -path-equivalence=/tmp,%S %s | FileCheck -check-prefixes=TEXT-FUNCTION,TEXT-HEADER %S/Inputs/showProjectSummary.test // RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -project-title "Test Suite" -name=main -path-equivalence=/tmp,%S %s | FileCheck -check-prefixes=TEXT-FUNCTION %S/Inputs/showProjectSummary.test
// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile=%t.profdata -o %t.dir -path-equivalence=/tmp,%S %s // RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile=%t.profdata -o %t.dir -path-equivalence=/tmp,%S %s
// RUN: FileCheck -check-prefixes=TEXT-FOOTER -input-file=%t.dir/index.txt %S/Inputs/showProjectSummary.test // RUN: FileCheck -check-prefixes=TEXT-FOOTER -input-file=%t.dir/index.txt %S/Inputs/showProjectSummary.test
// Test html output. // Test html output.
// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -format=html -o %t.dir -instr-profile %t.profdata -path-equivalence=/tmp,%S %s // RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -format=html -o %t.dir -instr-profile %t.profdata -path-equivalence=/tmp,%S %s
// RUN: FileCheck -check-prefixes=HTML,HTML-FILE,HTML-HEADER -input-file %t.dir/coverage/tmp/showProjectSummary.cpp.html %S/Inputs/showProjectSummary.test // RUN: FileCheck -check-prefixes=HTML,HTML-FILE,HTML-HEADER -input-file %t.dir/coverage/tmp/showProjectSummary.cpp.html %S/Inputs/showProjectSummary.test
// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -format=html -o %t.dir -instr-profile %t.profdata -project-title "Test Suite" -path-equivalence=/tmp,%S %s // RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -format=html -o %t.dir -instr-profile %t.profdata -project-title "Test Suite" -path-equivalence=/tmp,%S %s
// RUN: FileCheck -check-prefixes=HTML-TITLE,HTML,HTML-FILE,HTML-HEADER -input-file %t.dir/coverage/tmp/showProjectSummary.cpp.html %S/Inputs/showProjectSummary.test // RUN: FileCheck -check-prefixes=HTML-TITLE,HTML,HTML-FILE,HTML-HEADER -input-file %t.dir/coverage/tmp/showProjectSummary.cpp.html %S/Inputs/showProjectSummary.test
// RUN: FileCheck -check-prefixes=HTML-TITLE,HTML,HTML-FOOTER -input-file %t.dir/index.html %S/Inputs/showProjectSummary.test // RUN: FileCheck -check-prefixes=HTML-TITLE,HTML,HTML-FOOTER -input-file %t.dir/index.html %S/Inputs/showProjectSummary.test
// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -format=html -o %t.filtered.dir -instr-profile %t.profdata -project-title "Test Suite" -path-equivalence=/tmp,%S -name=main %s // RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -format=html -o %t.filtered.dir -instr-profile %t.profdata -project-title "Test Suite" -path-equivalence=/tmp,%S -name=main %s
// RUN: FileCheck -check-prefixes=HTML-TITLE,HTML,HTML-FOOTER -input-file %t.filtered.dir/index.html %S/Inputs/showProjectSummary.test // RUN: FileCheck -check-prefixes=HTML-TITLE,HTML,HTML-FOOTER -input-file %t.filtered.dir/index.html %S/Inputs/showProjectSummary.test