Revert "[llvm-cov] Create directory structure when filtering using -name*= options"

Test failures.

llvm-svn: 314314

8 files changed, 8 insertions, 128 deletions

diff --git a/llvm/test/tools/llvm-cov/Inputs/dir-with-filtering.covmapping b/llvm/test/tools/llvm-cov/Inputs/dir-with-filtering.covmapping
deleted file mode 100644
index 0f52ba896ec..00000000000
--- a/llvm/test/tools/llvm-cov/Inputs/dir-with-filtering.covmapping
+++ /dev/null
diff --git a/llvm/test/tools/llvm-cov/Inputs/dir-with-filtering.proftext b/llvm/test/tools/llvm-cov/Inputs/dir-with-filtering.proftext
deleted file mode 100644
index 6457ad1751e..00000000000
--- a/llvm/test/tools/llvm-cov/Inputs/dir-with-filtering.proftext
+++ /dev/null
@@ -1,32 +0,0 @@
-main
-# Func Hash:
-0
-# Num Counters:
-1
-# Counter Values:
-1
-
-_Z2f1v
-# Func Hash:
-0
-# Num Counters:
-1
-# Counter Values:
-1
-
-_Z2f2v
-# Func Hash:
-0
-# Num Counters:
-1
-# Counter Values:
-0
-
-_Z2f3v
-# Func Hash:
-0
-# Num Counters:
-1
-# Counter Values:
-0
-
diff --git a/llvm/test/tools/llvm-cov/Inputs/dir-with-filtering1.cpp b/llvm/test/tools/llvm-cov/Inputs/dir-with-filtering1.cpp
deleted file mode 100644
index b6a308f5ccb..00000000000
--- a/llvm/test/tools/llvm-cov/Inputs/dir-with-filtering1.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int f1() {
-  return 1;
-}
-
-int main() {
-  f1();
-  return 0;
-}
diff --git a/llvm/test/tools/llvm-cov/Inputs/dir-with-filtering2.cpp b/llvm/test/tools/llvm-cov/Inputs/dir-with-filtering2.cpp
deleted file mode 100644
index 2fa2c4e6ad1..00000000000
--- a/llvm/test/tools/llvm-cov/Inputs/dir-with-filtering2.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-int f2() {
-  return 2;
-}
-
-int f3() {
-  return 3;
-}
-
diff --git a/llvm/test/tools/llvm-cov/dir-with-filtering.test b/llvm/test/tools/llvm-cov/dir-with-filtering.test
deleted file mode 100644
index f3b68ddf763..00000000000
--- a/llvm/test/tools/llvm-cov/dir-with-filtering.test
+++ /dev/null
@@ -1,69 +0,0 @@
-RUN: llvm-profdata merge %S/Inputs/dir-with-filtering.proftext -o %t.profdata

-

-// Test TEXT both files

-

-RUN: llvm-cov show %S/Inputs/dir-with-filtering.covmapping -o %t.text -instr-profile %t.profdata -path-equivalence=/tmp,%S/Inputs -name=main -name=f2

-

-RUN: FileCheck -input-file=%t.text/index.txt %s -check-prefix=TEXT-INDEX

-TEXT-INDEX: dir-with-filtering1.cpp 1 0 100.00% 1 0 100.00% 4 0 100.00%

-TEXT-INDEX: dir-with-filtering2.cpp 1 1 0.00% 1 1 0.00% 3 3 0.00%

-

-RUN: FileCheck -input-file=%t.text/coverage/tmp/dir-with-filtering1.cpp.txt %s -check-prefix=TEXT-FILE1

-TEXT-FILE1: Coverage Report

-TEXT-FILE1-NOT: _Z2f1v:

-TEXT-FILE1: main:

-TEXT-FILE1-NEXT: {{.*}}int main()

-TEXT-FILE1-NOT: _Z2f1v:

-

-RUN: FileCheck -input-file=%t.text/coverage/tmp/dir-with-filtering2.cpp.txt %s -check-prefix=TEXT-FILE2

-TEXT-FILE2: Coverage Report

-TEXT-FILE2-NOT: _Z2f3v:

-TEXT-FILE2: _Z2f2v:

-TEXT-FILE2-NEXT: {{.*}}int f2()

-TEXT-FILE2-NOT: _Z2f3v:

-

-// Test TEXT one file

-

-RUN: llvm-cov show %S/Inputs/dir-with-filtering.covmapping -o %t.text_one_file -instr-profile %t.profdata -path-equivalence=/tmp,%S/Inputs -name=main -name=f2 %S/Inputs/dir-with-filtering1.cpp

-

-RUN: FileCheck -input-file=%t.text_one_file/index.txt %s -check-prefix=TEXT-INDEX-ONE-FILE

-TEXT-INDEX-ONE-FILE: dir-with-filtering1.cpp 1 0 100.00% 1 0 100.00% 4 0 100.00%

-TEXT-INDEX-ONE-FILE-NOT: dir-with-filtering2.cpp

-

-RUN: FileCheck -input-file=%t.text_one_file/coverage/tmp/dir-with-filtering1.cpp.txt %s -check-prefix=TEXT-FILE1

-

-// Test HTML both files

-

-RUN: llvm-profdata merge %S/Inputs/dir-with-filtering.proftext -o %t.profdata

-RUN: llvm-cov show %S/Inputs/dir-with-filtering.covmapping -format html -o %t.html -instr-profile %t.profdata -path-equivalence=/tmp,%S/Inputs -name=main -name=f2

-

-RUN: FileCheck -input-file=%t.html/index.html %s -check-prefix=HTML-INDEX

-HTML-INDEX: <h2>Coverage Report</h2>

-HTML-INDEX: dir-with-filtering1.cpp{{.*}}100.00% (1/1){{.*}}100.00% (4/4){{.*}}100.00% (1/1)

-HTML-INDEX: dir-with-filtering2.cpp{{.*}}0.00% (0/1){{.*}}0.00% (0/3){{.*}}0.00% (0/1)

-

-RUN: FileCheck -input-file=%t.html/coverage/tmp/dir-with-filtering1.cpp.html %s -check-prefix=HTML-FILE1

-HTML-FILE1-NOT: <pre>f1</pre>

-HTML-FILE1: <pre>main</pre>

-HTML-FILE1-NOT: <pre>f1</pre>

-HTML-FILE1: int main()

-HTML-FILE1-NOT: <pre>f1</pre>

-

-RUN: FileCheck -input-file=%t.html/coverage/tmp/dir-with-filtering2.cpp.html %s -check-prefix=HTML-FILE2

-HTML-FILE2-NOT: <pre>f3</pre>

-HTML-FILE2: <pre>_Z2f2v</pre>

-HTML-FILE2-NOT: <pre>f3</pre>

-HTML-FILE2: int f2()

-HTML-FILE2-NOT: <pre>f3</pre>

-

-// Test HTML one file

-

-RUN: llvm-profdata merge %S/Inputs/dir-with-filtering.proftext -o %t.profdata

-RUN: llvm-cov show %S/Inputs/dir-with-filtering.covmapping -format html -o %t.html_one_file -instr-profile %t.profdata -path-equivalence=/tmp,%S/Inputs -name=main -name=f2 %S/Inputs/dir-with-filtering1.cpp

-

-RUN: FileCheck -input-file=%t.html_one_file/index.html %s -check-prefix=HTML-INDEX-ONE-FILE

-HTML-INDEX-ONE-FILE: <h2>Coverage Report</h2>

-HTML-INDEX-ONE-FILE: dir-with-filtering1.cpp{{.*}}100.00% (1/1){{.*}}100.00% (4/4){{.*}}100.00% (1/1)

-HTML-INDEX-ONE-FILE-NOT: dir-with-filtering2.cpp

-

-RUN: FileCheck -input-file=%t.html_one_file/coverage/tmp/dir-with-filtering1.cpp.html %s -check-prefix=HTML-FILE1

diff --git a/llvm/test/tools/llvm-cov/showLineExecutionCounts.cpp b/llvm/test/tools/llvm-cov/showLineExecutionCounts.cpp
index c4b76824aac..ba974dc4db5 100644
--- a/llvm/test/tools/llvm-cov/showLineExecutionCounts.cpp
+++ b/llvm/test/tools/llvm-cov/showLineExecutionCounts.cpp
@@ -31,9 +31,9 @@ int main() {                              // TEXT: [[@LINE]]|   161|int main(
 
 // Test -output-dir.
 // RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -o %t.dir -instr-profile %t.profdata -path-equivalence=/tmp,%S %s
-// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -output-dir %t.filtered.dir -instr-profile %t.profdata -path-equivalence=/tmp,%S -name=main %s
+// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -output-dir %t.dir -instr-profile %t.profdata -path-equivalence=/tmp,%S -name=main %s
 // RUN: FileCheck -check-prefixes=TEXT,WHOLE-FILE -input-file %t.dir/coverage/tmp/showLineExecutionCounts.cpp.txt %s
-// RUN: FileCheck -check-prefixes=TEXT,FILTER -input-file %t.filtered.dir/coverage/tmp/showLineExecutionCounts.cpp.txt %s
+// RUN: FileCheck -check-prefixes=TEXT,FILTER -input-file %t.dir/functions.txt %s
 //
 // RUN: llvm-cov export %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -name=main 2>/dev/null > %t.export.json
 // RUN: FileCheck -input-file %t.export.json %S/Inputs/lineExecutionCounts.json
@@ -41,9 +41,9 @@ int main() {                              // TEXT: [[@LINE]]|   161|int main(
 //
 // Test html output.
 // RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -format html -o %t.html.dir -instr-profile %t.profdata -path-equivalence=/tmp,%S %s
-// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -format html -o %t.html.filtered.dir -instr-profile %t.profdata -path-equivalence=/tmp,%S -name=main %s
+// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -format html -o %t.html.dir -instr-profile %t.profdata -path-equivalence=/tmp,%S -name=main %s
 // RUN: FileCheck -check-prefixes=HTML,HTML-WHOLE-FILE -input-file %t.html.dir/coverage/tmp/showLineExecutionCounts.cpp.html %s
-// RUN: FileCheck -check-prefixes=HTML,HTML-FILTER -input-file %t.html.filtered.dir/coverage/tmp/showLineExecutionCounts.cpp.html %s
+// RUN: FileCheck -check-prefixes=HTML,HTML-FILTER -input-file %t.html.dir/functions.html %s
 //
 // HTML-WHOLE-FILE: <td class='line-number'><a name='L[[@LINE-44]]' href='#L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='uncovered-line'></td><td class='code'><pre>// before
 // HTML-FILTER-NOT: <td class='line-number'><a name='L[[@LINE-45]]' href='#L[[@LINE-45]]'><pre>[[@LINE-45]]</pre></a></td><td class='uncovered-line'></td><td class='code'><pre>// before
diff --git a/llvm/test/tools/llvm-cov/showTemplateInstantiations.cpp b/llvm/test/tools/llvm-cov/showTemplateInstantiations.cpp
index 428ceac7dba..3053b06c0bd 100644
--- a/llvm/test/tools/llvm-cov/showTemplateInstantiations.cpp
+++ b/llvm/test/tools/llvm-cov/showTemplateInstantiations.cpp
@@ -41,9 +41,9 @@ int main() {         // ALL:         [[@LINE]]| 1|int main() {
 
 // Test html output.
 // RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -path-equivalence=/tmp,%S %s -format html -o %t.html.dir
-// RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -path-equivalence=/tmp,%S -name=_Z4funcIbEiT_ %s -format html -o %t.html.filtered.dir
+// RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -path-equivalence=/tmp,%S -name=_Z4funcIbEiT_ %s -format html -o %t.html.dir
 // RUN: FileCheck -check-prefixes=HTML-SHARED,HTML-ALL -input-file=%t.html.dir/coverage/tmp/showTemplateInstantiations.cpp.html %s
-// RUN: FileCheck -check-prefixes=HTML-SHARED,HTML-FILTER -input-file=%t.html.filtered.dir/coverage/tmp/showTemplateInstantiations.cpp.html %s
+// RUN: FileCheck -check-prefixes=HTML-SHARED,HTML-FILTER -input-file=%t.html.dir/functions.html %s
 
 // HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]' href='#L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='uncovered-line'></td><td class='code'><pre>// before
 // HTML-FILTER-NOT: <td class='line-number'><a name='L[[@LINE-45]]' href='#L[[@LINE-45]]'><pre>[[@LINE-45]]</pre></a></td><td class='uncovered-line'></td><td class='code'><pre>// before
diff --git a/llvm/test/tools/llvm-cov/style.test b/llvm/test/tools/llvm-cov/style.test
index 202bc9de146..579189b9e03 100644
--- a/llvm/test/tools/llvm-cov/style.test
+++ b/llvm/test/tools/llvm-cov/style.test
@@ -1,17 +1,14 @@
 RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -path-equivalence=/tmp,%S %S/showTemplateInstantiations.cpp -format html -o %t.dir
 
-RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -path-equivalence=/tmp,%S -name=_Z4funcIbEiT_ %S/showTemplateInstantiations.cpp -format html -o %t.filtered.dir
+RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -path-equivalence=/tmp,%S -name=_Z4funcIbEiT_ %S/showTemplateInstantiations.cpp -format html -o %t.dir
 
 RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -path-equivalence=/tmp,%S %S/showTemplateInstantiations.cpp -format html | FileCheck %s -check-prefix=NODIR
 
 RUN: FileCheck %s -input-file=%t.dir/style.css -check-prefix=STYLE
+RUN: FileCheck %s -input-file=%t.dir/functions.html -check-prefix=TOPLEVEL
 RUN: FileCheck %s -input-file=%t.dir/index.html -check-prefix=TOPLEVEL
 RUN: FileCheck %s -input-file=%t.dir/coverage/tmp/showTemplateInstantiations.cpp.html -check-prefix=FILEVIEW
 
-RUN: FileCheck %s -input-file=%t.filtered.dir/style.css -check-prefix=STYLE
-RUN: FileCheck %s -input-file=%t.filtered.dir/index.html -check-prefix=TOPLEVEL
-RUN: FileCheck %s -input-file=%t.filtered.dir/coverage/tmp/showTemplateInstantiations.cpp.html -check-prefix=FILEVIEW
-
 STYLE-DAG: .red
 STYLE-DAG: .cyan
 STYLE-DAG: .source-name-title