[compiler-rt] r262162 - Test cleanups

[Xinliang David Li via llvm-commits]

Author: davidxl
Date: Sat Feb 27 18:54:28 2016
New Revision: 262162

URL: http://llvm.org/viewvc/llvm-project?rev=262162&view=rev
Log:
Test cleanups

Modified:
    compiler-rt/trunk/test/profile/Linux/coverage_dtor.cpp
    compiler-rt/trunk/test/profile/Linux/coverage_test.cpp
    compiler-rt/trunk/test/profile/instrprof-value-prof.test

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=262162&r1=262161&r2=262162&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/Linux/coverage_dtor.cpp (original)
+++ compiler-rt/trunk/test/profile/Linux/coverage_dtor.cpp Sat Feb 27 18:54:28 2016
@@ -1,4 +1,4 @@
-// RUN: %clang -x c++ -fno-exceptions  -std=c++11 -fuse-ld=gold -fprofile-instr-generate -fcoverage-mapping -o %t %s
+// 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

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=262162&r1=262161&r2=262162&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/Linux/coverage_test.cpp (original)
+++ compiler-rt/trunk/test/profile/Linux/coverage_test.cpp Sat Feb 27 18:54:28 2016
@@ -1,18 +1,18 @@
-// RUN: %clang_profgen -fuse-ld=gold -O2 -fdata-sections -ffunction-sections -fprofile-instr-generate -fcoverage-mapping -Wl,--gc-sections -o %t %s
+// 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
 // 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  -fprofile-instr-generate -fcoverage-mapping  -o %t.2 %s
+// 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
 // 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  -fprofile-instr-generate -fcoverage-mapping -Wl,--gc-sections -o %t.3 %s
+// RUN: %clang_profgen -O2  -fcoverage-mapping -Wl,--gc-sections -o %t.3 %s
 // RUN: llvm-objdump -h %t.3 | FileCheck --check-prefix COVMAP %s
 // Check PIE option
-// RUN: %clang_profgen -fuse-ld=gold -O2 -fdata-sections -ffunction-sections -fPIE -pie -fprofile-instr-generate -fcoverage-mapping -Wl,--gc-sections -o %t.pie %s
+// 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

Modified: compiler-rt/trunk/test/profile/instrprof-value-prof.test
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-value-prof.test?rev=262162&r1=262161&r2=262162&view=diff
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-value-prof.test (original)
+++ compiler-rt/trunk/test/profile/instrprof-value-prof.test Sat Feb 27 18:54:28 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_profgen -O2 -fprofile-instr-generate -mllvm -enable-value-profiling=true -o %t %S/Inputs/instrprof-value-prof-real.c
+// RUN: %clang_profgen -O2 -mllvm -enable-value-profiling=true -o %t %S/Inputs/instrprof-value-prof-real.c
 // RUN: env LLVM_PROFILE_FILE=%t.profraw %run %t
 // RUN: llvm-profdata merge -o %t.profdata %t.profraw
 // RUN: llvm-profdata show --all-functions -ic-targets  %t.profdata | FileCheck  %S/Inputs/instrprof-value-prof-real.c