Revert 2 tests from "Tests for r236055."

This partially reverts commit r236056, as the two tests were using the same
names and, when executed in parallel, were having intermittent failures.

llvm-svn: 236101

diff --git a/compiler-rt/test/profile/instrprof-override-filename-then-reset-default.c b/compiler-rt/test/profile/instrprof-override-filename-then-reset-default.c
deleted file mode 100644 (file)
index 4190fb5..0000000
--- a/compiler-rt/test/profile/instrprof-override-filename-then-reset-default.c
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: %clang_profgen -o %t -O3 %s
-// RUN: %run %t %t.profraw
-// RUN: llvm-profdata merge -o %t.profdata default.profraw
-// RUN: %clang_profuse=%t.profdata -o - -S -emit-llvm %s | FileCheck %s
-
-void __llvm_profile_override_default_filename(const char *);
-int main(int argc, const char *argv[]) {
-  // CHECK: br i1 %{{.*}}, label %{{.*}}, label %{{.*}}, !prof ![[PD1:[0-9]+]]
-  if (argc < 2)
-    return 1;
-  __llvm_profile_override_default_filename(argv[1]);
-  __llvm_profile_override_default_filename(0);
-  return 0;
-}
-// CHECK: ![[PD1]] = !{!"branch_weights", i32 1, i32 2}

diff --git a/compiler-rt/test/profile/instrprof-set-filename-then-reset-default.c b/compiler-rt/test/profile/instrprof-set-filename-then-reset-default.c
deleted file mode 100644 (file)
index 41e3ed0..0000000
--- a/compiler-rt/test/profile/instrprof-set-filename-then-reset-default.c
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: %clang_profgen -o %t -O3 %s
-// RUN: %run %t %t.profraw
-// RUN: llvm-profdata merge -o %t.profdata default.profraw
-// RUN: %clang_profuse=%t.profdata -o - -S -emit-llvm %s | FileCheck %s
-
-void __llvm_profile_set_filename(const char *);
-int main(int argc, const char *argv[]) {
-  // CHECK: br i1 %{{.*}}, label %{{.*}}, label %{{.*}}, !prof ![[PD1:[0-9]+]]
-  if (argc < 2)
-    return 1;
-  __llvm_profile_set_filename(argv[1]);
-  __llvm_profile_set_filename(0);
-  return 0;
-}
-// CHECK: ![[PD1]] = !{!"branch_weights", i32 1, i32 2}