r149587 reverted

llvm-svn: 149594
diff --git a/clang/test/CodeGen/inline2.c b/clang/test/CodeGen/inline2.c
index 3e5602c..fca4fff 100644
--- a/clang/test/CodeGen/inline2.c
+++ b/clang/test/CodeGen/inline2.c
@@ -1,63 +1,61 @@
-// RUN: echo "GNU89 tests:"
-// RUN: %clang_cc1 -O1 -triple i386-apple-darwin9 -emit-llvm -o %t -std=gnu89 %s
-// RUN: grep "define i32 @f0()" %t
-// RUN: grep "define i32 @f1()" %t
-// RUN: grep "define i32 @f2()" %t
-// RUN: grep "define i32 @f3()" %t
-// RUN: grep "define i32 @f5()" %t
-// RUN: grep "define i32 @f6()" %t
-// RUN: grep "define i32 @f7()" %t
-// RUN: grep "define i32 @fA()" %t
-// RUN: grep "define available_externally i32 @f4()" %t
-// RUN: grep "define available_externally i32 @f8()" %t
-// RUN: grep "define available_externally i32 @f9()" %t
+// RUN: %clang_cc1 -O1 -std=gnu89 -triple i386-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix GNU89 %s
+// RUN: %clang_cc1 -O1 -std=c99 -triple i386-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix C99 %s
 
-// RUN: echo "C99 tests:"
-// RUN: %clang_cc1 -O1 -triple i386-apple-darwin9 -emit-llvm -o %t -std=c99 %s
-// RUN: grep "define i32 @f0()" %t
-// RUN: grep "define i32 @f1()" %t
-// RUN: grep "define i32 @f2()" %t
-// RUN: grep "define i32 @f3()" %t
-// RUN: grep "define i32 @f5()" %t
-// RUN: grep "define i32 @f6()" %t
-// RUN: grep "define i32 @f7()" %t
-// RUN: grep "define available_externally i32 @fA()" %t
-// RUN: grep "define i32 @f4()" %t
-// RUN: grep "define i32 @f8()" %t
-// RUN: grep "define i32 @f9()" %t
-
+// CHECK-GNU89: define i32 @f0()
+// CHECK-C99: define i32 @f0()
 int f0(void);
 int f0(void) { return 0; }
 
+// CHECK-GNU89: define i32 @f1()
+// CHECK-C99: define i32 @f1()
 inline int f1(void);
 int f1(void) { return 0; }
 
+// CHECK-GNU89: define i32 @f2()
+// CHECK-C99: define i32 @f2()
 int f2(void);
 inline int f2(void) { return 0; }
 
+// CHECK-GNU89: define i32 @f3()
+// CHECK-C99: define i32 @f3()
 extern inline int f3(void);
 int f3(void) { return 0; }
 
+// CHECK-GNU89: define i32 @f5()
+// CHECK-C99: define i32 @f5()
 extern inline int f5(void);
 inline int f5(void) { return 0; }
 
+// CHECK-GNU89: define i32 @f6()
+// CHECK-C99: define i32 @f6()
 inline int f6(void);
 extern inline int f6(void) { return 0; }
 
+// CHECK-GNU89: define i32 @f7()
+// CHECK-C99: define i32 @f7()
 extern inline int f7(void);
 extern int f7(void) { return 0; }
 
+// CHECK-GNU89: define i32 @fA()
 inline int fA(void) { return 0; }
 
+// CHECK-GNU89: define available_externally i32 @f4()
+// CHECK-C99: define i32 @f4()
 int f4(void);
 extern inline int f4(void) { return 0; }
 
+// CHECK-GNU89: define available_externally i32 @f8()
+// CHECK-C99: define i32 @f8()
 extern int f8(void);
 extern inline int f8(void) { return 0; }
 
+// CHECK-GNU89: define available_externally i32 @f9()
+// CHECK-C99: define i32 @f9()
 extern inline int f9(void);
 extern inline int f9(void) { return 0; }
 
+// CHECK-C99: define available_externally i32 @fA()
+
 int test_all() { 
   return f0() + f1() + f2() + f3() + f4() + f5() + f6() + f7() + f8() + f9() 
     + fA();