Revert r268608 -- unexplained darwin bot failure

llvm-svn: 268779

3 files changed, 20 insertions, 5 deletions

diff --git a/compiler-rt/test/profile/Inputs/instrprof-value-prof-real.c b/compiler-rt/test/profile/Inputs/instrprof-value-prof-real.c
index 7893b90d4a7..a8733245147 100644
--- a/compiler-rt/test/profile/Inputs/instrprof-value-prof-real.c
+++ b/compiler-rt/test/profile/Inputs/instrprof-value-prof-real.c
@@ -53,7 +53,6 @@ int main() {
   return 0;
 }
 
-// IR: :ir
 // CHECK-LABEL:  main:
 // CHECK:	[ 0, foo_1_1_1_1_1_1_1_1_1, 1000 ]
 // CHECK-NEXT:	[ 0, foo_1_1_1_1_1_1_1_1_2, 999 ]
diff --git a/compiler-rt/test/profile/instrprof-value-prof-shared.test b/compiler-rt/test/profile/instrprof-value-prof-shared.test
new file mode 100644
index 00000000000..2a3f6410e58
--- /dev/null
+++ b/compiler-rt/test/profile/instrprof-value-prof-shared.test
@@ -0,0 +1,17 @@
+// XFAIL: arm
+// RUN: mkdir -p %t.d 
+// RUN: %clang_profgen -O2 -mllvm -enable-value-profiling=true -fPIC -shared -o %t.d/t.shared -DSHARED_LIB %S/Inputs/instrprof-value-prof-real.c
+// RUN: %clang_profgen -O2 -mllvm -enable-value-profiling=true -o %t -rpath %t.d %t.d/t.shared -DCALL_SHARED %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
+// RUN: llvm-profdata show --all-functions -ic-targets  %t.profdata | FileCheck  %S/Inputs/instrprof-value-prof-real.c --check-prefix=SHARED
+
+// IR level instrumentation
+// RUN: %clang_profgen -O2 -mllvm -disable-vp=false -Xclang -fprofile-instrument=llvm -fPIC -shared -o %t.d/t.ir.shared -DSHARED_LIB  %S/Inputs/instrprof-value-prof-real.c
+// RUN: %clang_profgen -O2 -mllvm -disable-vp=false -Xclang -fprofile-instrument=llvm -rpath %t.d -o %t.ir %t.d/t.ir.shared -DCALL_SHARED  %S/Inputs/instrprof-value-prof-real.c
+// RUN: env LLVM_PROFILE_FILE=%t.ir.profraw %run %t.ir
+// RUN: llvm-profdata merge -o %t.ir.profdata %t.ir.profraw
+// RUN: llvm-profdata show --all-functions -ic-targets  %t.ir.profdata | FileCheck  %S/Inputs/instrprof-value-prof-real.c
+// RUN: llvm-profdata merge -text  %t.ir.profdata -o %t.ir.proftxt 
+// RUN: llvm-profdata show --all-functions -ic-targets  %t.ir.profdata | FileCheck  %S/Inputs/instrprof-value-prof-real.c --check-prefix=SHARED
diff --git a/compiler-rt/test/profile/instrprof-value-prof.test b/compiler-rt/test/profile/instrprof-value-prof.test
index 76cf1bae3b4..4040ef36781 100644
--- a/compiler-rt/test/profile/instrprof-value-prof.test
+++ b/compiler-rt/test/profile/instrprof-value-prof.test
@@ -3,10 +3,9 @@
 // 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
 
-// IR level instrumentation
-// RUN: %clang_profgen -O2 -mllvm -disable-vp=false -Xclang -fprofile-instrument=llvm -o %t.ir  %S/Inputs/instrprof-value-prof-real.c
+// do two step build before the clang option is ready
+// RUN: %clang -O2 -mllvm -disable-vp=false -Xclang -fprofile-instrument=llvm -c -o %t.ir.o  %S/Inputs/instrprof-value-prof-real.c
+// RUN: %clang_profgen -O2 -o %t.ir  %t.ir.o
 // RUN: env LLVM_PROFILE_FILE=%t.ir.profraw %run %t.ir
 // RUN: llvm-profdata merge -o %t.ir.profdata %t.ir.profraw
 // RUN: llvm-profdata show --all-functions -ic-targets  %t.ir.profdata | FileCheck  %S/Inputs/instrprof-value-prof-real.c
-// RUN: llvm-profdata merge -text  %t.ir.profdata -o %t.ir.proftxt 
-// RUN: FileCheck  %S/Inputs/instrprof-value-prof-real.c --check-prefix=IR < %t.ir.proftxt