[llvm] r281578 - [llvm-cov] Fix tests that aren't checking anything (NFC)

Wed Sep 14 21:41:37 PDT 2016

Author: vedantk
Date: Wed Sep 14 23:41:37 2016
New Revision: 281578

URL: http://llvm.org/viewvc/llvm-project?rev=281578&view=rev
Log:
[llvm-cov] Fix tests that aren't checking anything (NFC)

E.g the 'showProjectSummary' test contains some checks which can't fail
because they match themselves...

Added:
    llvm/trunk/test/tools/llvm-cov/Inputs/showProjectSummary.test
Modified:
    llvm/trunk/test/tools/llvm-cov/native_separators.c
    llvm/trunk/test/tools/llvm-cov/showProjectSummary.cpp

Added: llvm/trunk/test/tools/llvm-cov/Inputs/showProjectSummary.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/Inputs/showProjectSummary.test?rev=281578&view=auto
==============================================================================

--- llvm/trunk/test/tools/llvm-cov/Inputs/showProjectSummary.test (added)
+++ llvm/trunk/test/tools/llvm-cov/Inputs/showProjectSummary.test Wed Sep 14 23:41:37 2016
@@ -0,0 +1,16 @@
+TEXT-TITLE: Test Suite
+TEXT: Coverage Report
+TEXT: Created:
+TEXT-FILE-NOT: (Binary: showProjectSummary.covmapping)
+TEXT-FUNCTION: main:
+TEXT-FOOTER: Generated by llvm-cov
+
+HTML-TITLE: <h1>Test Suite</h1>
+HTML: <h2>Coverage Report</h2>
+HTML: <h4>Created:{{.*}}</h4>
+HTML-FILE: <pre>{{.*}}showProjectSummary.cpp (Binary: showProjectSummary.covmapping)</pre>
+HTML-FUNCTION: <pre>main</pre>
+HTML-HEADER: <td><pre>Line No.</pre></td>
+HTML-HEADER: <td><pre>Count</pre></td>
+HTML-HEADER: <td><pre>Source (<a href='#L8'>jump to first uncovered line</a>)</pre></td>
+HTML-FOOTER: <h5>Generated by llvm-cov{{.*}}</h5>

Modified: llvm/trunk/test/tools/llvm-cov/native_separators.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/native_separators.c?rev=281578&r1=281577&r2=281578&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-cov/native_separators.c (original)
+++ llvm/trunk/test/tools/llvm-cov/native_separators.c Wed Sep 14 23:41:37 2016
@@ -18,7 +18,3 @@
 // HTML: <pre>\tmp\native_separators.c (Binary: native_separators.covmapping)</pre>
 
 int main() {}
-
-// RUN: llvm-cov show %S/Inputs/native_separators.covmapping -instr-profile=%t.profdata -filename-equivalence %s -o %t.dir
-// RUN: FileCheck -check-prefixes=TEXT -input-file=%t.dir/coverage/tmp/native_separators.c.txt %s
-// TEXT: \tmp\native_separators.c (Binary: native_separators.covmapping)

Modified: llvm/trunk/test/tools/llvm-cov/showProjectSummary.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/showProjectSummary.cpp?rev=281578&r1=281577&r2=281578&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-cov/showProjectSummary.cpp (original)
+++ llvm/trunk/test/tools/llvm-cov/showProjectSummary.cpp Wed Sep 14 23:41:37 2016
@@ -12,33 +12,17 @@ int main(int argc, char ** argv) {
 }
 
 // Test console output.
-// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -filename-equivalence %s | FileCheck -check-prefixes=TEXT,TEXT-FILE,TEXT-HEADER %s
-// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -project-title "Test Suite" -filename-equivalence %s | FileCheck -check-prefixes=TEXT-TITLE,TEXT,TEXT-FILE,TEXT-HEADER %s
-// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -project-title "Test Suite" -name=main -filename-equivalence %s | FileCheck -check-prefixes=TEXT-FUNCTION,TEXT-HEADER %s
+// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -filename-equivalence %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 -project-title "Test Suite" -filename-equivalence %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" -name=main -filename-equivalence %s | FileCheck -check-prefixes=TEXT-FUNCTION,TEXT-HEADER %S/Inputs/showProjectSummary.test
 // RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile=%t.profdata -o %t.dir -filename-equivalence %s
-// RUN: FileCheck -check-prefixes=TEXT-FOOTER -input-file=%t.dir/index.txt %s
-// TEXT-TITLE: Test Suite
-// TEXT: Coverage Report
-// TEXT: Created:
-// TEXT-FILE: showProjectSummary.cpp:
-// TEXT-FILE: showProjectSummary.covmapping:
-// TEXT-FUNCTION: main:
-// TEXT-FOOTER: Generated by llvm-cov
+// RUN: FileCheck -check-prefixes=TEXT-FOOTER -input-file=%t.dir/index.txt %S/Inputs/showProjectSummary.test
 
 // Test html output.
 // RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -format=html -o %t.dir -instr-profile %t.profdata -filename-equivalence %s
-// RUN: FileCheck -check-prefixes=HTML,HTML-FILE,HTML-HEADER -input-file %t.dir/coverage/tmp/showProjectSummary.cpp.html %s
+// 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" -filename-equivalence %s
-// RUN: FileCheck -check-prefixes=HTML-TITLE,HTML,HTML-FILE,HTML-HEADER -input-file %t.dir/coverage/tmp/showProjectSummary.cpp.html %s
-// RUN: FileCheck -check-prefixes=HTML-TITLE,HTML,HTML-FOOTER -input-file %t.dir/index.html %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-FOOTER -input-file %t.dir/index.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" -filename-equivalence -name=main %s
-// RUN: FileCheck -check-prefixes=HTML-FUNCTION,HTML-HEADER -input-file %t.dir/functions.html %s
-// HTML-TITLE: <h1>Test Suite</h1>
-// HTML: <h2>Coverage Report</h2>
-// HTML: <h4>Created:{{.*}}</h4>
-// HTML-FILE: <pre>{{.*}}showProjectSummary.cpp (Binary: showProjectSummary.covmapping)</pre>
-// HTML-FUNCTION: <pre>main</pre>
-// HTML-HEADER: <td><pre>Line No.</pre></td>
-// HTML-HEADER: <td><pre>Count</pre></td>
-// HTML-HEADER: <td><pre>Source (<a href='#L8'>jump to first uncovered line</a>)</pre></td>
-// HTML-FOOTER: <h5>Generated by llvm-cov{{.*}}</h5>
+// RUN: FileCheck -check-prefixes=HTML-FUNCTION,HTML-HEADER -input-file %t.dir/functions.html %S/Inputs/showProjectSummary.test


