aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Bendersky <eliben@chromium.org>2013-05-14 15:07:54 -0700
committerEli Bendersky <eliben@chromium.org>2013-05-14 15:07:54 -0700
commitc5d198304d851d6930cfe0cf3c719624109c4c95 (patch)
treeea346786ec6f2400de74caba2d6084ae78c62d64
parent8fe6f1f79c0d43752173a0aa8e752a3d21ea10f9 (diff)
Update tests to use FileCheck instead of grep (which is deprecated in the LLVM regression suite)
BUG=None R=mseaborn@chromium.org Review URL: https://codereview.chromium.org/15042009
-rw-r--r--test/Transforms/NaCl/expand-ctors-empty.ll5
-rw-r--r--test/Transforms/NaCl/expand-ctors-zeroinit.ll5
-rw-r--r--test/Transforms/NaCl/expand-ctors.ll7
-rw-r--r--test/Transforms/NaCl/expand-tls.ll7
4 files changed, 14 insertions, 10 deletions
diff --git a/test/Transforms/NaCl/expand-ctors-empty.ll b/test/Transforms/NaCl/expand-ctors-empty.ll
index 4368270765..f0788a0873 100644
--- a/test/Transforms/NaCl/expand-ctors-empty.ll
+++ b/test/Transforms/NaCl/expand-ctors-empty.ll
@@ -1,6 +1,7 @@
; Currently we do not define __{init,fini}_array_end as named aliases.
-; RUN: opt < %s -nacl-expand-ctors -S | not grep __init_array_end
-; RUN: opt < %s -nacl-expand-ctors -S | not grep __fini_array_end
+; RUN: opt < %s -nacl-expand-ctors -S | FileCheck %s -check-prefix=NO_CTORS
+; NO_CTORS-NOT: __init_array_end
+; NO_CTORS-NOT: __fini_array_end
; RUN: opt < %s -nacl-expand-ctors -S | FileCheck %s
diff --git a/test/Transforms/NaCl/expand-ctors-zeroinit.ll b/test/Transforms/NaCl/expand-ctors-zeroinit.ll
index d02741f0b5..824b2b23b7 100644
--- a/test/Transforms/NaCl/expand-ctors-zeroinit.ll
+++ b/test/Transforms/NaCl/expand-ctors-zeroinit.ll
@@ -1,6 +1,7 @@
; Currently we do not define __{init,fini}_array_end as named aliases.
-; RUN: opt < %s -nacl-expand-ctors -S | not grep __init_array_end
-; RUN: opt < %s -nacl-expand-ctors -S | not grep __fini_array_end
+; RUN: opt < %s -nacl-expand-ctors -S | FileCheck %s -check-prefix=NO_CTORS
+; NO_CTORS-NOT: __init_array_end
+; NO_CTORS-NOT: __fini_array_end
; We expect this symbol to be removed:
; RUN: opt < %s -nacl-expand-ctors -S | not grep llvm.global_ctors
diff --git a/test/Transforms/NaCl/expand-ctors.ll b/test/Transforms/NaCl/expand-ctors.ll
index 7f202618e7..250abbc1bf 100644
--- a/test/Transforms/NaCl/expand-ctors.ll
+++ b/test/Transforms/NaCl/expand-ctors.ll
@@ -1,7 +1,8 @@
; We expect these symbol names to be removed:
-; RUN: opt < %s -nacl-expand-ctors -S | not grep llvm.global_ctors
-; RUN: opt < %s -nacl-expand-ctors -S | not grep __init_array_end
-; RUN: opt < %s -nacl-expand-ctors -S | not grep __fini_array_end
+; RUN: opt < %s -nacl-expand-ctors -S | FileCheck %s -check-prefix=NO_CTORS
+; NO_CTORS-NOT: llvm.global.ctors
+; NO_CTORS-NOT: __init_array_end
+; NO_CTORS-NOT: __fini_array_end
; RUN: opt < %s -nacl-expand-ctors -S | FileCheck %s
diff --git a/test/Transforms/NaCl/expand-tls.ll b/test/Transforms/NaCl/expand-tls.ll
index ec572ffa2c..b824ec074e 100644
--- a/test/Transforms/NaCl/expand-tls.ll
+++ b/test/Transforms/NaCl/expand-tls.ll
@@ -1,8 +1,9 @@
; RUN: opt < %s -nacl-expand-tls -S | FileCheck %s
; All thread-local variables should be removed
-; RUN: opt < %s -nacl-expand-tls -S | not grep thread_local
+; RUN: opt < %s -nacl-expand-tls -S | FileCheck %s -check-prefix=NO_TLS
+; NO_TLS-NOT: thread_local
@tvar1 = thread_local global i64 123
@tvar2 = thread_local global i32 456
@@ -73,7 +74,7 @@ define i32 @test_get_tp_tls_offset(i32 %tls_size) {
; Uses of the intrinsic are replaced with uses of a regular function.
; CHECK: define i32 @test_get_tp_tls_offset
; CHECK: call i32 @nacl_tp_tls_offset
-; RUN: opt < %s -nacl-expand-tls -S | not grep llvm.nacl.tp.tls.offset
+; NO_TLS-NOT: llvm.nacl.tp.tls.offset
define i32 @test_get_tp_tdb_offset(i32 %tdb_size) {
%offset = call i32 @llvm.nacl.tp.tdb.offset(i32 %tdb_size)
@@ -82,4 +83,4 @@ define i32 @test_get_tp_tdb_offset(i32 %tdb_size) {
; Uses of the intrinsic are replaced with uses of a regular function.
; CHECK: define i32 @test_get_tp_tdb_offset
; CHECK: call i32 @nacl_tp_tdb_offset
-; RUN: opt < %s -nacl-expand-tls -S | not grep llvm.nacl.tp.tdb.offset
+; NO_TLS-NOT: llvm.nacl.tp.tdb.offset