3 files changed, 7 insertions, 24 deletions
diff --git a/clang/test/InterfaceStubs/driver-test.c b/clang/test/InterfaceStubs/driver-test.c
index bb2868f6df0..d4e50295411 100644
--- a/clang/test/InterfaceStubs/driver-test.c
+++ b/clang/test/InterfaceStubs/driver-test.c
@@ -1,13 +1,11 @@
 // REQUIRES: x86-registered-target
 
-// RUN: %clang -target x86_64-unknown-linux-gnu -x c -o %t1 -emit-interface-stubs %s %S/object.c %S/weak.cpp
-// RUN: llvm-nm %t1 2>&1 | FileCheck %s
-// RUN: llvm-nm %t1.ifso 2>&1 | FileCheck %s
+// RUN: %clang -target x86_64-unknown-linux-gnu -x c -o %t1.so -emit-interface-stubs %s %S/object.c %S/weak.cpp && \
+// RUN: llvm-nm %t1.so 2>&1 | FileCheck --check-prefix=CHECK-IFS %s
 
-// CHECK-DAG: data
-// CHECK-DAG: foo
-// CHECK-DAG: strongFunc
-// CHECK-DAG: weakFunc
+// CHECK-IFS-DAG: data
+// CHECK-IFS-DAG: foo
+// CHECK-IFS-DAG: strongFunc
+// CHECK-IFS-DAG: weakFunc
 
 int foo(int bar) { return 42 + 1844; }
-int main() { return foo(23); }
diff --git a/clang/test/InterfaceStubs/driver-test2.c b/clang/test/InterfaceStubs/driver-test2.c
deleted file mode 100644
index f0f889a799d..00000000000
--- a/clang/test/InterfaceStubs/driver-test2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-// REQUIRES: x86-registered-target
-
-// RUN: %clang -target x86_64-unknown-linux-gnu -c -emit-interface-stubs \
-// RUN:   %s %S/object.c %S/weak.cpp
-// RUN: %clang -emit-interface-stubs -emit-merged-ifs \
-// RUN:   driver-test2.o object.o weak.o -S -o - | FileCheck %s
-
-// CHECK-DAG: data
-// CHECK-DAG: bar
-// CHECK-DAG: strongFunc
-// CHECK-DAG: weakFunc
-
-int bar(int a) { return a; }
-int main() { return 0; }
diff --git a/clang/test/InterfaceStubs/windows.cpp b/clang/test/InterfaceStubs/windows.cpp
index c81c702861e..9ccb771a2f3 100644
--- a/clang/test/InterfaceStubs/windows.cpp
+++ b/clang/test/InterfaceStubs/windows.cpp
@@ -1,7 +1,6 @@
 // REQUIRES: x86-registered-target
 // RUN: %clang_cc1 -triple x86_64-windows-msvc -o - %s -emit-interface-stubs | FileCheck -check-prefix=CHECK-CC1 %s
-// RUN: %clang -target x86_64-windows-msvc -o - %s -emit-interface-stubs -emit-merged-ifs -S | FileCheck -check-prefix=CHECK-IFS %s
-// note: -S is added here to prevent clang from invoking link.exe
+// RUN: %clang -target x86_64-windows-msvc -o - %s -emit-interface-stubs -emit-merged-ifs | FileCheck -check-prefix=CHECK-IFS %s
 
 // CHECK-CC1: Symbols:
 // CHECK-CC1-NEXT: ?helloWindowsMsvc@@YAHXZ