test: Convert some tests to FileCheck

These were all doing trivial greps. It's better to use FileCheck.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@227007 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CodeGen/align-local.c b/test/CodeGen/align-local.c
index b839ee14a10be4234f8b6526d3c9710f52811981..c8b27a83c3ff76a4d48bdabed208ca0e4592bc77 100644 (file)
--- a/test/CodeGen/align-local.c
+++ b/test/CodeGen/align-local.c
@@ -1,7 +1,9 @@
-// RUN: %clang_cc1 -emit-llvm < %s | grep "align 16" | count 2
+// RUN: %clang_cc1 -emit-llvm < %s | FileCheck %s
 
 typedef struct __attribute((aligned(16))) {int x[4];} ff;
 
+// CHECK: alloca %struct.ff, align 16
+// CHECK: alloca %struct.anon, align 16
 int a() {
   ff a;
   struct {int x[4];} b __attribute((aligned(16)));

diff --git a/test/CodeGen/cleanup-stack.c b/test/CodeGen/cleanup-stack.c
index 72a1a6c751a9b33c2a855119f8421fe63442dc76..6448aac2384ad9a0116b842cf67a32450b929184 100644 (file)
--- a/test/CodeGen/cleanup-stack.c
+++ b/test/CodeGen/cleanup-stack.c
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -triple i386-unknown-unknown -O3 -emit-llvm %s -o %t
-// RUN: grep "ret i32 9" %t
+// RUN: %clang_cc1 -triple i386-unknown-unknown -O3 -emit-llvm %s -o - | FileCheck %s
+// CHECK: ret i32 9
 
 struct s0 {
   int *var;

diff --git a/test/CodeGen/enum.c b/test/CodeGen/enum.c
index 0e239f1a8ee34b5b3dcad855a6c85ab9216a94cf..ef50f9eead64930cad853b1a565797f550e2ced5 100644 (file)
--- a/test/CodeGen/enum.c
+++ b/test/CodeGen/enum.c
@@ -1,5 +1,7 @@
-// RUN: %clang_cc1 -triple i386-unknown-unknown %s -O3 -emit-llvm -o - | grep 'ret i32 6'
-// RUN: %clang_cc1 -triple i386-unknown-unknown -x c++ %s -O3 -emit-llvm -o - | grep 'ret i32 7'
+// RUN: %clang_cc1 -triple i386-unknown-unknown %s -O3 -emit-llvm -o - | FileCheck -check-prefix=CHECK-C %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -x c++ %s -O3 -emit-llvm -o - | FileCheck -check-prefix=CHECK-CXX %s
+// CHECK-C: ret i32 6
+// CHECK-CXX: ret i32 7
 
 // This test case illustrates a peculiarity of the promotion of
 // enumeration types in C and C++. In particular, the enumeration type
@@ -19,4 +21,3 @@ int main (void)
 
   return r;
 }
-

diff --git a/test/CodeGen/kr-func-promote.c b/test/CodeGen/kr-func-promote.c
index fcdbac3ee424b3a0b8757bc8d7f9b3aa69982111..8e55dc91edf4d8ff028d8e27d9982ab35ec7088b 100644 (file)
--- a/test/CodeGen/kr-func-promote.c
+++ b/test/CodeGen/kr-func-promote.c
@@ -1,4 +1,5 @@
-// RUN: %clang_cc1 -triple i386-unknown-unknown %s -emit-llvm -o - | grep "i32 @a(i32)"
+// RUN: %clang_cc1 -triple i386-unknown-unknown %s -emit-llvm -o - | FileCheck %s
+// CHECK: i32 @a(i32)
 
 int a();
 int a(x) short x; {return x;}

diff --git a/test/CodeGen/private-extern.c b/test/CodeGen/private-extern.c
index 2d34d543213d9aca7db0a980801902a07b65c37a..26b3fcede5ab0d98ef7a84101787f219119a03a1 100644 (file)
--- a/test/CodeGen/private-extern.c
+++ b/test/CodeGen/private-extern.c
@@ -1,6 +1,7 @@
-// RUN: %clang_cc1 -emit-llvm -o %t %s
-// RUN: grep '@g0 = external hidden constant i32' %t
-// RUN: grep '@g1 = hidden constant i32 1' %t
+// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s
+
+// CHECK-DAG: @g0 = external hidden constant i32
+// CHECK-DAG: @g1 = hidden constant i32 1
 
 __private_extern__ const int g0;
 __private_extern__ const int g1 = 1;

diff --git a/test/CodeGen/vla-2.c b/test/CodeGen/vla-2.c
index 0a74907f7b2db3123e060209519e92b78f9a49a2..894913da3ec73116c62bb7b29f9e5703cbd79523 100644 (file)
--- a/test/CodeGen/vla-2.c
+++ b/test/CodeGen/vla-2.c
@@ -1,4 +1,5 @@
-// RUN: %clang_cc1 -std=gnu99 %s -emit-llvm -o - | grep ".*alloca.*align 16"
+// RUN: %clang_cc1 -std=gnu99 %s -emit-llvm -o - | FileCheck %s
+// CHECK: alloca {{.*}}, align 16
 
 extern void bar(int[]);
 

diff --git a/test/CodeGen/vla-3.c b/test/CodeGen/vla-3.c
index 4927b464231f61dc2c7c3a95563c5965e9cee924..66acf58c1feb711489b09ae2111febc5725163d7 100644 (file)
--- a/test/CodeGen/vla-3.c
+++ b/test/CodeGen/vla-3.c
@@ -1,4 +1,5 @@
-// RUN: %clang_cc1 -std=gnu99 %s -emit-llvm -o - | grep ".*alloca.*align 16"
+// RUN: %clang_cc1 -std=gnu99 %s -emit-llvm -o - | FileCheck %s
+// CHECK: alloca {{.*}}, align 16
 
 void adr(char *);