summaryrefslogtreecommitdiffstats
path: root/test/Feature
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2007-04-14 16:40:08 +0000
committerReid Spencer <rspencer@reidspencer.com>2007-04-14 16:40:08 +0000
commitaf6676df04acdeef0ab864307e5c586fe0e50ed0 (patch)
tree425067d4321eb7f1e5f735087f220913067f498d /test/Feature
parent2b88e5ecab2688d52c2b16c27ee5d48eb368fe6e (diff)
downloadexternal_llvm-af6676df04acdeef0ab864307e5c586fe0e50ed0.zip
external_llvm-af6676df04acdeef0ab864307e5c586fe0e50ed0.tar.gz
external_llvm-af6676df04acdeef0ab864307e5c586fe0e50ed0.tar.bz2
For PR1319:
Changes necessary for conversion of this directory to run the tests under the llvm.exp version of llvm_runtest git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35993 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Feature')
-rw-r--r--test/Feature/dg.exp2
-rw-r--r--test/Feature/globalredefinition2.ll2
-rw-r--r--test/Feature/globalredefinition3.ll6
-rwxr-xr-xtest/Feature/packed_struct.ll7
4 files changed, 8 insertions, 9 deletions
diff --git a/test/Feature/dg.exp b/test/Feature/dg.exp
index ff34508..694e4fd 100644
--- a/test/Feature/dg.exp
+++ b/test/Feature/dg.exp
@@ -1,3 +1,3 @@
-load_lib llvm-dg.exp
+load_lib llvm.exp
llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Feature/globalredefinition2.ll b/test/Feature/globalredefinition2.ll
index d99a80d..8ec6ca7 100644
--- a/test/Feature/globalredefinition2.ll
+++ b/test/Feature/globalredefinition2.ll
@@ -1,5 +1,5 @@
; Test that redefinitions of globals produces an error in llvm-upgrade
-; RUN: llvm-upgrade < %s -o /dev/null -f 2>&1 | \
+; RUN: llvm-upgrade < %s -o /dev/null -f |& \
; RUN: grep "Renaming global variable 'B' to.*linkage errors"
%B = global int 7
diff --git a/test/Feature/globalredefinition3.ll b/test/Feature/globalredefinition3.ll
index 8e81d21..7b753a9 100644
--- a/test/Feature/globalredefinition3.ll
+++ b/test/Feature/globalredefinition3.ll
@@ -1,8 +1,6 @@
-; When PR1067 is fixed, this should not be XFAIL any more.
-; RUN: llvm-as < %s -o /dev/null -f 2>&1 | \
+; RUN: ignore llvm-as < %s -o /dev/null -f |& \
; RUN: grep "Redefinition of global variable named 'B'"
-
-; Test forward references and redefinitions of globals
+; END.
@B = global i32 7
@B = global i32 7
diff --git a/test/Feature/packed_struct.ll b/test/Feature/packed_struct.ll
index b6934d4..ecf129f 100755
--- a/test/Feature/packed_struct.ll
+++ b/test/Feature/packed_struct.ll
@@ -1,8 +1,9 @@
; RUN: llvm-as < %s | llvm-dis > %t1.ll
; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
-; RUN: diff %t1.ll %t2.ll &&
-; RUN: not grep cast %t2.ll &&
-; RUN: grep "<{" %t2.ll
+; RUN: diff %t1.ll %t2.ll
+; RUN: not grep cast %t2.ll
+; RUN: grep '\<{' %t2.ll
+; END.
%struct.anon = type <{ i8, i32, i32, i32 }>
@foos = external global %struct.anon