Rollback 260394 -- 32bit test needs more config support

llvm-svn: 260402

diff --git a/compiler-rt/test/profile/Linux/coverage_ctors.cpp b/compiler-rt/test/profile/Linux/coverage_ctors.cpp
index 611ae96..fe4a2be 100644 (file)
--- a/compiler-rt/test/profile/Linux/coverage_ctors.cpp
+++ b/compiler-rt/test/profile/Linux/coverage_ctors.cpp
@@ -2,11 +2,6 @@
 // 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
-// 32 bit testing.
-// RUN: %clang_profgen -x c++  -std=c++11 -fuse-ld=gold -fcoverage-mapping -m32 -o %t.32 %s
-// RUN: env LLVM_PROFILE_FILE=%t.32.profraw %run %t.32
-// RUN: llvm-profdata merge -o %t.32.profdata %t.32.profraw
-// RUN: llvm-cov show %t.32 -instr-profile %t.32.profdata -filename-equivalence 2>&1 | FileCheck %s
 
 struct Base {
   int B;

diff --git a/compiler-rt/test/profile/Linux/coverage_dtor.cpp b/compiler-rt/test/profile/Linux/coverage_dtor.cpp
index 8b1e1c7..c59c34d 100644 (file)
--- a/compiler-rt/test/profile/Linux/coverage_dtor.cpp
+++ b/compiler-rt/test/profile/Linux/coverage_dtor.cpp
@@ -2,11 +2,6 @@
 // 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
-// 32 bit testing
-// RUN: %clang -x c++ -fno-exceptions  -std=c++11 -fuse-ld=gold -fprofile-instr-generate -fcoverage-mapping -m32 -o %t.32 %s
-// RUN: env LLVM_PROFILE_FILE=%t.32.profraw %run %t.32
-// RUN: llvm-profdata merge -o %t.32.profdata %t.32.profraw
-// RUN: llvm-cov show %t.32 -instr-profile %t.32.profdata -filename-equivalence 2>&1 | FileCheck %s
 
 int g = 100;
 struct Base {

diff --git a/compiler-rt/test/profile/Linux/coverage_shared.test b/compiler-rt/test/profile/Linux/coverage_shared.test
index 748c9b3..e2b0e3e 100644 (file)
--- a/compiler-rt/test/profile/Linux/coverage_shared.test
+++ b/compiler-rt/test/profile/Linux/coverage_shared.test
@@ -14,18 +14,3 @@ RUN: llvm-profdata merge -o %t-shared.profdata %t-shared.profraw
 RUN: llvm-cov show -instr-profile %t-shared.profdata %t.d/a.shared | FileCheck --check-prefix=COV %S/../Inputs/instrprof-dynamic-a.cpp
 RUN: llvm-cov show -instr-profile %t-static.profdata %t-static | FileCheck --check-prefix=COV %S/../Inputs/instrprof-dynamic-a.cpp
 
-
-RUN: %clang_profgen -fdata-sections -ffunction-sections -fcoverage-mapping -m32 -c -o %t.d/a.32.shared.o -fPIC  %S/../Inputs/instrprof-dynamic-a.cpp
-RUN: %clang_profgen -fdata-sections -ffunction-sections -fuse-ld=gold -Wl,--gc-sections -fcoverage-mapping -m32 -o %t.d/a.32.shared -fPIC -shared %S/../Inputs/instrprof-dynamic-a.cpp
-RUN: %clang_profgen -fdata-sections -ffunction-sections -fuse-ld=gold -Wl,--gc-sections -m32 -o %t.32-shared -fPIC -rpath %t.d %t.d/a.32.shared %S/../Inputs/instrprof-dynamic-b.cpp %S/../Inputs/instrprof-dynamic-main.cpp
-
-RUN: %clang_profgen -fdata-sections -ffunction-sections -fuse-ld=gold -Wl,--gc-sections -m32 -o %t.32-static %t.d/a.32.shared.o %S/../Inputs/instrprof-dynamic-b.cpp %S/../Inputs/instrprof-dynamic-main.cpp
-
-RUN: env LLVM_PROFILE_FILE=%t.32-static.profraw %run %t.32-static
-RUN: env LLVM_PROFILE_FILE=%t.32-shared.profraw %run %t.32-shared
-
-RUN: llvm-profdata merge -o %t.32-static.profdata %t.32-static.profraw
-RUN: llvm-profdata merge -o %t.32-shared.profdata %t.32-shared.profraw
-
-RUN: llvm-cov show -instr-profile %t.32-shared.profdata %t.d/a.32.shared | FileCheck --check-prefix=COV %S/../Inputs/instrprof-dynamic-a.cpp
-RUN: llvm-cov show -instr-profile %t.32-static.profdata %t.32-static | FileCheck --check-prefix=COV %S/../Inputs/instrprof-dynamic-a.cpp

diff --git a/compiler-rt/test/profile/Linux/coverage_test.cpp b/compiler-rt/test/profile/Linux/coverage_test.cpp
index 26f385b..1443279 100644 (file)
--- a/compiler-rt/test/profile/Linux/coverage_test.cpp
+++ b/compiler-rt/test/profile/Linux/coverage_test.cpp
@@ -2,16 +2,11 @@
 // 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
-// Testing PIE
+//
 // 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: 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
-// testing m32
-// RUN: %clang_profgen -fuse-ld=gold -O2 -fdata-sections -ffunction-sections -fPIE -pie -fprofile-instr-generate -fcoverage-mapping -m32 -Wl,--gc-sections -o %t.32.pie %s
-// RUN: env LLVM_PROFILE_FILE=%t.32.pie.profraw %run %t.32.pie
-// RUN: llvm-profdata merge -o %t.32.pie.profdata %t.32.pie.profraw
-// RUN: llvm-cov show %t.32.pie -instr-profile %t.32.pie.profdata -filename-equivalence 2>&1 | FileCheck %s
 
 void foo(bool cond) { // CHECK:  1| [[@LINE]]|void foo(
   if (cond) {         // CHECK:  1| [[@LINE]]|  if (cond) {