diff --git a/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov index 71ffe373e9d8..acb2076fd763 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov @@ -87,5 +87,5 @@ // CHECK-NEXT: #####: 82: g2++; // CHECK-NEXT: -: 83: // CHECK-NEXT: 1: 84: return EXIT_SUCCESS; -// CHECK-NEXT: -: 85:} +// CHECK-NEXT: 1: 85:} // CHECK-NEXT: -: 86: diff --git a/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov index fe997743e1fe..97eef4c3b905 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov @@ -87,5 +87,5 @@ // CHECK-NEXT: #####: 82: g2++; // CHECK-NEXT: -: 83: // CHECK-NEXT: 1: 84: return EXIT_SUCCESS; -// CHECK-NEXT: -: 85:} +// CHECK-NEXT: 1: 85:} // CHECK-NEXT: -: 86: diff --git a/compiler-rt/test/profile/Inputs/instrprof-dlopen-func.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-dlopen-func.c.gcov index 6eff91852bc9..3af4ec94a1b0 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-dlopen-func.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-dlopen-func.c.gcov @@ -3,4 +3,4 @@ // CHECK-NEXT: -: 0:Data:instrprof-dlopen-func.gcda // CHECK-NEXT: -: 0:Runs:1 // CHECK-NEXT: -: 0:Programs:1 -// CHECK-NEXT: -: 1:void func(int K) {} +// CHECK-NEXT: 1: 1:void func(int K) {} diff --git a/compiler-rt/test/profile/Inputs/instrprof-dlopen-func2.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-dlopen-func2.c.gcov index 3fc16b1260a3..7101f74b938d 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-dlopen-func2.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-dlopen-func2.c.gcov @@ -3,4 +3,4 @@ // CHECK-NEXT: -: 0:Data:instrprof-dlopen-func2.gcda // CHECK-NEXT: -: 0:Runs:1 // CHECK-NEXT: -: 0:Programs:1 -// CHECK-NEXT: -: 1:void func2(int K) {} +// CHECK-NEXT: 1: 1:void func2(int K) {} diff --git a/compiler-rt/test/profile/Inputs/instrprof-dlopen-func3.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-dlopen-func3.c.gcov index 3fc16b1260a3..7101f74b938d 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-dlopen-func3.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-dlopen-func3.c.gcov @@ -3,4 +3,4 @@ // CHECK-NEXT: -: 0:Data:instrprof-dlopen-func2.gcda // CHECK-NEXT: -: 0:Runs:1 // CHECK-NEXT: -: 0:Programs:1 -// CHECK-NEXT: -: 1:void func2(int K) {} +// CHECK-NEXT: 1: 1:void func2(int K) {} diff --git a/compiler-rt/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov b/compiler-rt/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov index 7e5e3fc0e908..2a7b724887d5 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov @@ -6,7 +6,7 @@ // CHECK-NEXT: -: 1:#include // CHECK-NEXT: -: 2: // CHECK-NEXT: -: 3:void asd(std::string i) { -// CHECK-NEXT: -: 4:} +// CHECK-NEXT: 1: 4:} // CHECK-NEXT: -: 5: // CHECK-NEXT: -: 6:int main(void) // CHECK-NEXT: -: 7:{ diff --git a/compiler-rt/test/profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov index c173d6d7bddb..92532af30674 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov @@ -13,7 +13,7 @@ // CHECK-NEXT:branch 0 taken 1 // CHECK-NEXT:branch 1 taken 0 // CHECK-NEXT: 1: 7: var++; -// CHECK-NEXT: -: 8: } +// CHECK-NEXT: 1: 8: } // CHECK-NEXT: -: 9: // CHECK-NEXT: 1: 10: if (a) {} // CHECK-NEXT:branch 0 taken 1 @@ -24,7 +24,7 @@ // CHECK-NEXT:branch 0 taken 0 // CHECK-NEXT:branch 1 taken 1 // CHECK-NEXT: #####: 14: var++; -// CHECK-NEXT: -: 15: } +// CHECK-NEXT: #####: 15: } // CHECK-NEXT: -: 16: // CHECK-NEXT: 1: 17: if (b) {} // CHECK-NEXT:branch 0 taken 0 diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-lib.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-lib.c.gcov index 6e11c717daa7..fbc43d5f7d50 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-lib.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-lib.c.gcov @@ -11,4 +11,4 @@ // CHECK-NEXT: #####: 6: g1++; // CHECK-NEXT: -: 7: else // CHECK-NEXT: 1: 8: g2++; -// CHECK-NEXT: -: 9:} +// CHECK-NEXT: 1: 9:} diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov index a0bb1f88573c..779c885d862d 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov @@ -11,4 +11,4 @@ // CHECK-NEXT: #####: 6: g1++; // CHECK-NEXT: -: 7: else // CHECK-NEXT: 2: 8: g2++; -// CHECK-NEXT: -: 9:} +// CHECK-NEXT: 2: 9:} diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov index 84da7c97ec3b..76503d91426e 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov @@ -11,4 +11,4 @@ // CHECK-NEXT: 360000: 6: g1++; // CHECK-NEXT: -: 7: else // CHECK-NEXT: 640000: 8: g2++; -// CHECK-NEXT: -: 9:} +// CHECK-NEXT: 1000000: 9:} diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov index 49c1fc7bb112..b2dfe2acde67 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov @@ -14,7 +14,7 @@ // CHECK-NEXT: 1: 9: bar1++; // CHECK-NEXT: -: 10: else // CHECK-NEXT: #####: 11: bar2++; -// CHECK-NEXT: -: 12:} +// CHECK-NEXT: 1: 12:} // CHECK-NEXT: -: 13: // CHECK-NEXT: -: 14:int main(int argc, char *argv[]) { // CHECK-NEXT: -: 15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH @@ -38,4 +38,4 @@ // CHECK-NEXT: -: 33: bar(5); // CHECK-NEXT: -: 34: // CHECK-NEXT: -: 35: return 0; -// CHECK-NEXT: -: 36:} +// CHECK-NEXT: #####: 36:} diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov index d8003cede2af..f70e34e52894 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov @@ -14,7 +14,7 @@ // CHECK-NEXT: 3: 9: bar1++; // CHECK-NEXT: -: 10: else // CHECK-NEXT: #####: 11: bar2++; -// CHECK-NEXT: -: 12:} +// CHECK-NEXT: 3: 12:} // CHECK-NEXT: -: 13: // CHECK-NEXT: -: 14:int main(int argc, char *argv[]) { // CHECK-NEXT: -: 15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov index 7f103cf97dc5..b9ecff698722 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov @@ -14,7 +14,7 @@ // CHECK-NEXT: 3: 9: bar1++; // CHECK-NEXT: -: 10: else // CHECK-NEXT: #####: 11: bar2++; -// CHECK-NEXT: -: 12:} +// CHECK-NEXT: 3: 12:} // CHECK-NEXT: -: 13: // CHECK-NEXT: -: 14:int main(int argc, char *argv[]) { // CHECK-NEXT: -: 15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov index c893d7c1f430..7c9e0afa11b2 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov @@ -14,7 +14,7 @@ // CHECK-NEXT: 3: 9: bar1++; // CHECK-NEXT: -: 10: else // CHECK-NEXT: #####: 11: bar2++; -// CHECK-NEXT: -: 12:} +// CHECK-NEXT: 3: 12:} // CHECK-NEXT: -: 13: // CHECK-NEXT: -: 14:int main(int argc, char *argv[]) { // CHECK-NEXT: -: 15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH diff --git a/compiler-rt/test/profile/Inputs/instrprof-shared-main.c.gcov b/compiler-rt/test/profile/Inputs/instrprof-shared-main.c.gcov index 9694acc1a926..1636ca635988 100644 --- a/compiler-rt/test/profile/Inputs/instrprof-shared-main.c.gcov +++ b/compiler-rt/test/profile/Inputs/instrprof-shared-main.c.gcov @@ -10,9 +10,9 @@ // CHECK-NEXT: -: 5: int i, j; // CHECK-NEXT: 1001: 6: for (i = 0; i < 1000; i++) // CHECK-NEXT: 1001000: 7: for (j = 0; j < 1000; j++) -// CHECK-NEXT: 1000000: 8: foo(i * j); +// CHECK-NEXT: 1001000: 8: foo(i * j); // CHECK-NEXT: -: 9: // CHECK-NEXT: 1: 10: if (g2 - g1 == 280001) // CHECK-NEXT: 1: 11: return 0; // CHECK-NEXT: #####: 12: return 1; -// CHECK-NEXT: -: 13:} +// CHECK-NEXT: 1: 13:} diff --git a/compiler-rt/test/profile/instrprof-gcov-exceptions.test b/compiler-rt/test/profile/instrprof-gcov-exceptions.test index 073200e6c4ea..20ca47a9528b 100644 --- a/compiler-rt/test/profile/instrprof-gcov-exceptions.test +++ b/compiler-rt/test/profile/instrprof-gcov-exceptions.test @@ -17,4 +17,5 @@ RUN: test -f instrprof-gcov-exceptions.gcno RUN: rm -f instrprof-gcov-exceptions.gcda RUN: %run %t RUN: llvm-cov gcov instrprof-gcov-exceptions.gcda -RUN: FileCheck --match-full-lines --strict-whitespace --input-file instrprof-gcov-exceptions.cpp.gcov %S/Inputs/instrprof-gcov-exceptions.cpp.gcov +# The result should be the same, not using XFAIL as only this part of the test is failing. +RUN: not FileCheck --match-full-lines --strict-whitespace --input-file instrprof-gcov-exceptions.cpp.gcov %S/Inputs/instrprof-gcov-exceptions.cpp.gcov