FileCheck-ize these tests.

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

diff --git a/test/Analysis/CallGraph/2008-09-09-DirectCall.ll b/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
index 784d6c7ba1b123ab1e9246ee0561477e91d95613..55d0be6f26fd1fe5e08640d8b6fcf280729e7f95 100644 (file)
--- a/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
+++ b/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
@@ -1,5 +1,9 @@
-; RUN: opt < %s -print-callgraph -disable-output |& \
-; RUN:   grep {calls function 'callee'} | count 2
+; RUN: opt < %s -print-callgraph -disable-output |& FileCheck %s
+
+; CHECK: Call graph node <<null function>>
+; CHECK:  CS<{{.*}}> calls function 'callee'
+; CHECK: Call graph node for function: 'caller'
+; CHECK:  CS<{{.*}}> calls function 'callee'
 
 define internal void @callee(...) {
 entry:

diff --git a/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll b/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
index 0c5ef92ef71ecea59478f57636179c91743aff58..632cd0c790a71c131782cf3ddc444c9ddfb5770d 100644 (file)
--- a/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
+++ b/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
@@ -1,7 +1,9 @@
-; RUN: opt < %s -print-callgraph -disable-output |& grep {calls function}
+; RUN: opt < %s -print-callgraph -disable-output |& FileCheck %s
 
 @a = global void ()* @f                ; <void ()**> [#uses=0]
 
+; CHECK: calls function 'f'
+
 define internal void @f() {
        unreachable
 }