[compiler-rt] r310836 - [llvm-cov] Fix compiler-rt tests failing in build bots after rL310827.

[Sean Eveson via llvm-commits]

Author: seaneveson
Date: Mon Aug 14 05:43:05 2017
New Revision: 310836

URL: http://llvm.org/viewvc/llvm-project?rev=310836&view=rev
Log:
[llvm-cov] Fix compiler-rt tests failing in build bots after rL310827.

The compiler-rt tests used llvm-cov with -filename-equivelence, which was
replaced with the new option -path-equivalence in rL310827.


Modified:
    compiler-rt/trunk/test/profile/Linux/coverage_ctors.cpp
    compiler-rt/trunk/test/profile/Linux/coverage_dtor.cpp
    compiler-rt/trunk/test/profile/Linux/coverage_test.cpp
    compiler-rt/trunk/test/profile/Linux/instrprof-comdat.test

Modified: compiler-rt/trunk/test/profile/Linux/coverage_ctors.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/Linux/coverage_ctors.cpp?rev=310836&r1=310835&r2=310836&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/Linux/coverage_ctors.cpp (original)
+++ compiler-rt/trunk/test/profile/Linux/coverage_ctors.cpp Mon Aug 14 05:43:05 2017
@@ -1,7 +1,7 @@
 // RUN: %clangxx_profgen -std=c++11 -fuse-ld=gold -fcoverage-mapping -o %t %s
 // RUN: env LLVM_PROFILE_FILE=%t.profraw %run %t
 // RUN: llvm-profdata merge -o %t.profdata %t.profraw
-// RUN: llvm-cov show %t -instr-profile %t.profdata -filename-equivalence 2>&1 | FileCheck %s
+// RUN: llvm-cov show %t -instr-profile %t.profdata -path-equivalence=/tmp,%S 2>&1 | FileCheck %s
 
 struct Base {
   int B;

Modified: compiler-rt/trunk/test/profile/Linux/coverage_dtor.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/Linux/coverage_dtor.cpp?rev=310836&r1=310835&r2=310836&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/Linux/coverage_dtor.cpp (original)
+++ compiler-rt/trunk/test/profile/Linux/coverage_dtor.cpp Mon Aug 14 05:43:05 2017
@@ -1,7 +1,7 @@
 // RUN: %clang_profgen -x c++ -fno-exceptions  -std=c++11 -fuse-ld=gold -fcoverage-mapping -o %t %s
 // RUN: env LLVM_PROFILE_FILE=%t.profraw %run %t
 // RUN: llvm-profdata merge -o %t.profdata %t.profraw
-// RUN: llvm-cov show %t -instr-profile %t.profdata -filename-equivalence 2>&1 | FileCheck %s
+// RUN: llvm-cov show %t -instr-profile %t.profdata -path-equivalence=/tmp,%S 2>&1 | FileCheck %s
 
 int g = 100;
 struct Base {

Modified: compiler-rt/trunk/test/profile/Linux/coverage_test.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/Linux/coverage_test.cpp?rev=310836&r1=310835&r2=310836&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/Linux/coverage_test.cpp (original)
+++ compiler-rt/trunk/test/profile/Linux/coverage_test.cpp Mon Aug 14 05:43:05 2017
@@ -1,12 +1,12 @@
 // RUN: %clang_profgen -fuse-ld=gold -O2 -fdata-sections -ffunction-sections -fcoverage-mapping -Wl,--gc-sections -o %t %s
 // RUN: env LLVM_PROFILE_FILE=%t.profraw %run %t
 // RUN: llvm-profdata merge -o %t.profdata %t.profraw
-// RUN: llvm-cov show %t -instr-profile %t.profdata -filename-equivalence 2>&1 | FileCheck %s
+// RUN: llvm-cov show %t -instr-profile %t.profdata -path-equivalence=/tmp,%S 2>&1 | FileCheck %s
 // BFD linker older than 2.26 has a bug that per-func profile data will be wrongly garbage collected when GC is turned on. We only do end-to-end test here without GC:
 // RUN: %clang_profgen -O2  -fcoverage-mapping  -o %t.2 %s
 // RUN: env LLVM_PROFILE_FILE=%t.2.profraw %run %t.2
 // RUN: llvm-profdata merge -o %t.2.profdata %t.2.profraw
-// RUN: llvm-cov show %t.2 -instr-profile %t.2.profdata -filename-equivalence 2>&1 | FileCheck %s
+// RUN: llvm-cov show %t.2 -instr-profile %t.2.profdata -path-equivalence=/tmp,%S 2>&1 | FileCheck %s
 // Check covmap is not garbage collected when GC is turned on with BFD linker. Due to the bug mentioned above, we can only
 // do the check with objdump:
 // RUN: %clang_profgen -O2  -fcoverage-mapping -Wl,--gc-sections -o %t.3 %s
@@ -15,7 +15,7 @@
 // RUN: %clang_profgen -fuse-ld=gold -O2 -fdata-sections -ffunction-sections -fPIE -pie -fcoverage-mapping -Wl,--gc-sections -o %t.pie %s
 // RUN: env LLVM_PROFILE_FILE=%t.pie.profraw %run %t.pie
 // RUN: llvm-profdata merge -o %t.pie.profdata %t.pie.profraw
-// RUN: llvm-cov show %t.pie -instr-profile %t.pie.profdata -filename-equivalence 2>&1 | FileCheck %s
+// RUN: llvm-cov show %t.pie -instr-profile %t.pie.profdata -path-equivalence=/tmp,%S 2>&1 | FileCheck %s
 
 void foo(bool cond) { // CHECK:  [[@LINE]]| 1|void foo(
   if (cond) {         // CHECK:  [[@LINE]]| 1| if (cond) {

Modified: compiler-rt/trunk/test/profile/Linux/instrprof-comdat.test
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/Linux/instrprof-comdat.test?rev=310836&r1=310835&r2=310836&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/Linux/instrprof-comdat.test (original)
+++ compiler-rt/trunk/test/profile/Linux/instrprof-comdat.test Mon Aug 14 05:43:05 2017
@@ -2,5 +2,5 @@ RUN: mkdir -p %t.d
 RUN: %clangxx_profgen -o %t.d/comdat -fcoverage-mapping -fuse-ld=gold %S/../Inputs/instrprof-comdat-1.cpp %S/../Inputs/instrprof-comdat-2.cpp
 RUN: LLVM_PROFILE_FILE=%t-comdat.profraw %run %t.d/comdat
 RUN: llvm-profdata merge -o %t.d/comdat.prof %t-comdat.profraw 
-RUN: llvm-cov show --filename-equivalence --instr-profile=%t.d/comdat.prof %t.d/comdat | FileCheck --check-prefix=HEADER %S/../Inputs/instrprof-comdat.h
+RUN: llvm-cov show --path-equivalence=/tmp,%S --instr-profile=%t.d/comdat.prof %t.d/comdat | FileCheck --check-prefix=HEADER %S/../Inputs/instrprof-comdat.h