[compiler-rt] r342661 - [profile] Fix tests in compiler-rt for patch in gcov (https://reviews.llvm.org/D49659)

[Calixte Denizet via llvm-commits]

Author: calixte
Date: Thu Sep 20 09:21:09 2018
New Revision: 342661

URL: http://llvm.org/viewvc/llvm-project?rev=342661&view=rev
Log:
[profile] Fix tests in compiler-rt for patch in gcov (https://reviews.llvm.org/D49659)

Summary: Some tests are broken if patch in D49659 is accepted so this patch fixes them.

Reviewers: marco-c

Reviewed By: marco-c

Subscribers: dberris, delcypher, llvm-commits, #sanitizers

Differential Revision: https://reviews.llvm.org/D49721

Modified:
    compiler-rt/trunk/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov
    compiler-rt/trunk/test/profile/Inputs/instrprof-shared-main.c.gcov
    compiler-rt/trunk/test/profile/instrprof-gcov-multiple-bbs-single-line.test

Modified: compiler-rt/trunk/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov?rev=342661&r1=342660&r2=342661&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov (original)
+++ compiler-rt/trunk/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov Thu Sep 20 09:21:09 2018
@@ -6,7 +6,7 @@
 // CHECK-NEXT:        -:    1:#include <string>
 // CHECK-NEXT:        -:    2:
 // CHECK-NEXT:        -:    3:void asd(std::string i) {
-// CHECK-NEXT:        2:    4:}
+// CHECK-NEXT:        1:    4:}
 // CHECK-NEXT:        -:    5:
 // CHECK-NEXT:        -:    6:int main(void)
 // CHECK-NEXT:        -:    7:{

Modified: compiler-rt/trunk/test/profile/Inputs/instrprof-shared-main.c.gcov
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/Inputs/instrprof-shared-main.c.gcov?rev=342661&r1=342660&r2=342661&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/Inputs/instrprof-shared-main.c.gcov (original)
+++ compiler-rt/trunk/test/profile/Inputs/instrprof-shared-main.c.gcov Thu Sep 20 09:21:09 2018
@@ -8,8 +8,8 @@
 // CHECK-NEXT:        -:    3:
 // CHECK-NEXT:        -:    4:int main() {
 // CHECK-NEXT:        -:    5:  int i, j;
-// CHECK-NEXT:     2002:    6:  for (i = 0; i < 1000; i++)
-// CHECK-NEXT:  2002000:    7:    for (j = 0; j < 1000; j++)
+// CHECK-NEXT:     1001:    6:  for (i = 0; i < 1000; i++)
+// CHECK-NEXT:  1001000:    7:    for (j = 0; j < 1000; j++)
 // CHECK-NEXT:  1001000:    8:      foo(i * j);
 // CHECK-NEXT:        -:    9:
 // CHECK-NEXT:        1:   10:  if (g2 - g1 == 280001)

Modified: compiler-rt/trunk/test/profile/instrprof-gcov-multiple-bbs-single-line.test
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-gcov-multiple-bbs-single-line.test?rev=342661&r1=342660&r2=342661&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-gcov-multiple-bbs-single-line.test (original)
+++ compiler-rt/trunk/test/profile/instrprof-gcov-multiple-bbs-single-line.test Thu Sep 20 09:21:09 2018
@@ -1,5 +1,3 @@
-XFAIL: *
-
 RUN: mkdir -p %t.d
 RUN: cd %t.d