[llvm-commits] [llvm] r159520 - in /llvm/trunk/test: Linker/2003-04-21-Linkage.ll Linker/Inputs/ Linker/Inputs/PR11464.a.ll Linker/Inputs/PR11464.b.ll Linker/Inputs/PR8300.a.ll Linker/Inputs/PR8300.b.ll Linker/Inputs/basiclink.a.ll Linker/Inputs/basiclink.b.ll Linker/Inputs/linkage.a.ll Linker/Inputs/linkage.b.ll Linker/PR8300.ll Linker/basiclink.ll Linker/linkage.ll Linker/multiple-merged-structs.ll lit.cfg
Chandler Carruth
chandlerc at gmail.com
Mon Jul 2 03:18:06 PDT 2012
Author: chandlerc
Date: Mon Jul 2 05:18:06 2012
New Revision: 159520
URL: http://llvm.org/viewvc/llvm-project?rev=159520&view=rev
Log:
Switch a bunch of Linker tests from using elaborate echo productions to
just provide and reference separate input files from an Inputs
subdirectory. This pattern works very well in the Clang tree and is
easier to understand in my opinion. It also has fewer limitations and
will remove one particularly annoying use of TCL-style {} quoting from
the testsuite.
Also teach the LLVM lit configuration to avoid recursing into 'Inputs'
subdirectories. This wasn't required for the previous 'Inputs'
subdirectories used due to fortuitous suffix patterns.
This is the first step to completely removing support for TCL-style tests.
Added:
llvm/trunk/test/Linker/Inputs/
llvm/trunk/test/Linker/Inputs/PR11464.a.ll
llvm/trunk/test/Linker/Inputs/PR11464.b.ll
- copied, changed from r159504, llvm/trunk/test/Linker/multiple-merged-structs.ll
llvm/trunk/test/Linker/Inputs/PR8300.a.ll
llvm/trunk/test/Linker/Inputs/PR8300.b.ll
- copied, changed from r159504, llvm/trunk/test/Linker/PR8300.ll
llvm/trunk/test/Linker/Inputs/basiclink.a.ll
llvm/trunk/test/Linker/Inputs/basiclink.b.ll
llvm/trunk/test/Linker/Inputs/linkage.a.ll
llvm/trunk/test/Linker/Inputs/linkage.b.ll
llvm/trunk/test/Linker/linkage.ll
Removed:
llvm/trunk/test/Linker/2003-04-21-Linkage.ll
Modified:
llvm/trunk/test/Linker/PR8300.ll
llvm/trunk/test/Linker/basiclink.ll
llvm/trunk/test/Linker/multiple-merged-structs.ll
llvm/trunk/test/lit.cfg
Removed: llvm/trunk/test/Linker/2003-04-21-Linkage.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-04-21-Linkage.ll?rev=159519&view=auto
==============================================================================
--- llvm/trunk/test/Linker/2003-04-21-Linkage.ll (original)
+++ llvm/trunk/test/Linker/2003-04-21-Linkage.ll (removed)
@@ -1,14 +0,0 @@
-; RUN: echo {@X = linkonce global i32 5 \
-; RUN: define linkonce i32 @foo() \{ ret i32 7 \} } | llvm-as > %t.1.bc
-; RUN: llvm-as %s -o %t.2.bc
-; RUN: llvm-link %t.1.bc %t.2.bc
- at X = external global i32
-
-declare i32 @foo()
-
-define void @bar() {
- load i32* @X
- call i32 @foo()
- ret void
-}
-
Added: llvm/trunk/test/Linker/Inputs/PR11464.a.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/PR11464.a.ll?rev=159520&view=auto
==============================================================================
--- llvm/trunk/test/Linker/Inputs/PR11464.a.ll (added)
+++ llvm/trunk/test/Linker/Inputs/PR11464.a.ll Mon Jul 2 05:18:06 2012
@@ -0,0 +1,3 @@
+%bug_type = type opaque
+declare i32 @bug_a(%bug_type*)
+declare i32 @bug_b(%bug_type*)
Copied: llvm/trunk/test/Linker/Inputs/PR11464.b.ll (from r159504, llvm/trunk/test/Linker/multiple-merged-structs.ll)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/PR11464.b.ll?p2=llvm/trunk/test/Linker/Inputs/PR11464.b.ll&p1=llvm/trunk/test/Linker/multiple-merged-structs.ll&r1=159504&r2=159520&rev=159520&view=diff
==============================================================================
--- llvm/trunk/test/Linker/multiple-merged-structs.ll (original)
+++ llvm/trunk/test/Linker/Inputs/PR11464.b.ll Mon Jul 2 05:18:06 2012
@@ -1,9 +1,3 @@
-; RUN: echo {%bug_type = type opaque \
-; RUN: declare i32 @bug_a(%bug_type*) \
-; RUN: declare i32 @bug_b(%bug_type*) } > %t.ll
-; RUN: llvm-link %t.ll %s
-; PR11464
-
%bug_type = type { %bug_type* }
%bar = type { i32 }
Added: llvm/trunk/test/Linker/Inputs/PR8300.a.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/PR8300.a.ll?rev=159520&view=auto
==============================================================================
--- llvm/trunk/test/Linker/Inputs/PR8300.a.ll (added)
+++ llvm/trunk/test/Linker/Inputs/PR8300.a.ll Mon Jul 2 05:18:06 2012
@@ -0,0 +1,2 @@
+%foo2 = type { [8 x i8] }
+declare void @zed(%foo2*)
Copied: llvm/trunk/test/Linker/Inputs/PR8300.b.ll (from r159504, llvm/trunk/test/Linker/PR8300.ll)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/PR8300.b.ll?p2=llvm/trunk/test/Linker/Inputs/PR8300.b.ll&p1=llvm/trunk/test/Linker/PR8300.ll&r1=159504&r2=159520&rev=159520&view=diff
==============================================================================
--- llvm/trunk/test/Linker/PR8300.ll (original)
+++ llvm/trunk/test/Linker/Inputs/PR8300.b.ll Mon Jul 2 05:18:06 2012
@@ -1,7 +1,3 @@
-; RUN: echo {%foo2 = type \{ \[8 x i8\] \} \
-; RUN: declare void @zed(%foo2*) } > %t.ll
-; RUN: llvm-link %t.ll %s -o %t.bc
-
%foo = type { [8 x i8] }
%bar = type { [9 x i8] }
Added: llvm/trunk/test/Linker/Inputs/basiclink.a.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/basiclink.a.ll?rev=159520&view=auto
==============================================================================
--- llvm/trunk/test/Linker/Inputs/basiclink.a.ll (added)
+++ llvm/trunk/test/Linker/Inputs/basiclink.a.ll Mon Jul 2 05:18:06 2012
@@ -0,0 +1,2 @@
+define i32* @foo(i32 %x) { ret i32* @baz }
+ at baz = external global i32
Added: llvm/trunk/test/Linker/Inputs/basiclink.b.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/basiclink.b.ll?rev=159520&view=auto
==============================================================================
--- llvm/trunk/test/Linker/Inputs/basiclink.b.ll (added)
+++ llvm/trunk/test/Linker/Inputs/basiclink.b.ll Mon Jul 2 05:18:06 2012
@@ -0,0 +1,6 @@
+declare i32* @foo(...)
+define i32* @bar() {
+ %ret = call i32* (...)* @foo( i32 123 )
+ ret i32* %ret
+}
+ at baz = global i32 0
Added: llvm/trunk/test/Linker/Inputs/linkage.a.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/linkage.a.ll?rev=159520&view=auto
==============================================================================
--- llvm/trunk/test/Linker/Inputs/linkage.a.ll (added)
+++ llvm/trunk/test/Linker/Inputs/linkage.a.ll Mon Jul 2 05:18:06 2012
@@ -0,0 +1,2 @@
+ at X = linkonce global i32 5
+define linkonce i32 @foo() { ret i32 7 }
Added: llvm/trunk/test/Linker/Inputs/linkage.b.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/linkage.b.ll?rev=159520&view=auto
==============================================================================
--- llvm/trunk/test/Linker/Inputs/linkage.b.ll (added)
+++ llvm/trunk/test/Linker/Inputs/linkage.b.ll Mon Jul 2 05:18:06 2012
@@ -0,0 +1,10 @@
+ at X = external global i32
+
+declare i32 @foo()
+
+define void @bar() {
+ load i32* @X
+ call i32 @foo()
+ ret void
+}
+
Modified: llvm/trunk/test/Linker/PR8300.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/PR8300.ll?rev=159520&r1=159519&r2=159520&view=diff
==============================================================================
--- llvm/trunk/test/Linker/PR8300.ll (original)
+++ llvm/trunk/test/Linker/PR8300.ll Mon Jul 2 05:18:06 2012
@@ -1,13 +1 @@
-; RUN: echo {%foo2 = type \{ \[8 x i8\] \} \
-; RUN: declare void @zed(%foo2*) } > %t.ll
-; RUN: llvm-link %t.ll %s -o %t.bc
-
-%foo = type { [8 x i8] }
-%bar = type { [9 x i8] }
-
- at zed = alias bitcast (void (%bar*)* @xyz to void (%foo*)*)
-
-define void @xyz(%bar* %this) {
-entry:
- ret void
-}
+; RUN: llvm-link %S/Inputs/PR8300.a.ll %S/Inputs/PR8300.b.ll -o %t.bc
Modified: llvm/trunk/test/Linker/basiclink.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/basiclink.ll?rev=159520&r1=159519&r2=159520&view=diff
==============================================================================
--- llvm/trunk/test/Linker/basiclink.ll (original)
+++ llvm/trunk/test/Linker/basiclink.ll Mon Jul 2 05:18:06 2012
@@ -1,13 +1,6 @@
; Test linking two functions with different prototypes and two globals
; in different modules. This is for PR411
-; RUN: llvm-as %s -o %t.bar.bc
-; RUN: echo {define i32* @foo(i32 %x) \{ ret i32* @baz \} \
-; RUN: @baz = external global i32 } | llvm-as -o %t.foo.bc
-; RUN: llvm-link %t.bar.bc %t.foo.bc -o %t.bc
+; RUN: llvm-as %S/Inputs/basiclink.a.ll -o %t.foo.bc
+; RUN: llvm-as %S/Inputs/basiclink.b.ll -o %t.bar.bc
; RUN: llvm-link %t.foo.bc %t.bar.bc -o %t.bc
-declare i32* @foo(...)
-define i32* @bar() {
- %ret = call i32* (...)* @foo( i32 123 )
- ret i32* %ret
-}
- at baz = global i32 0
+; RUN: llvm-link %t.bar.bc %t.foo.bc -o %t.bc
Added: llvm/trunk/test/Linker/linkage.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/linkage.ll?rev=159520&view=auto
==============================================================================
--- llvm/trunk/test/Linker/linkage.ll (added)
+++ llvm/trunk/test/Linker/linkage.ll Mon Jul 2 05:18:06 2012
@@ -0,0 +1,3 @@
+; RUN: llvm-as %S/Inputs/linkage.a.ll -o %t.1.bc
+; RUN: llvm-as %S/Inputs/linkage.b.ll -o %t.2.bc
+; RUN: llvm-link %t.1.bc %t.2.bc
Modified: llvm/trunk/test/Linker/multiple-merged-structs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/multiple-merged-structs.ll?rev=159520&r1=159519&r2=159520&view=diff
==============================================================================
--- llvm/trunk/test/Linker/multiple-merged-structs.ll (original)
+++ llvm/trunk/test/Linker/multiple-merged-structs.ll Mon Jul 2 05:18:06 2012
@@ -1,19 +1,2 @@
-; RUN: echo {%bug_type = type opaque \
-; RUN: declare i32 @bug_a(%bug_type*) \
-; RUN: declare i32 @bug_b(%bug_type*) } > %t.ll
-; RUN: llvm-link %t.ll %s
+; RUN: llvm-link %S/Inputs/PR11464.a.ll %S/Inputs/PR11464.b.ll
; PR11464
-
-%bug_type = type { %bug_type* }
-%bar = type { i32 }
-
-define i32 @bug_a(%bug_type* %fp) nounwind uwtable {
-entry:
- %d_stream = getelementptr inbounds %bug_type* %fp, i64 0, i32 0
- ret i32 0
-}
-
-define i32 @bug_b(%bar* %a) nounwind uwtable {
-entry:
- ret i32 0
-}
Modified: llvm/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=159520&r1=159519&r2=159520&view=diff
==============================================================================
--- llvm/trunk/test/lit.cfg (original)
+++ llvm/trunk/test/lit.cfg Mon Jul 2 05:18:06 2012
@@ -19,6 +19,11 @@
# set by on_clone().
config.suffixes = []
+# excludes: A list of directories to exclude from the testsuite. The 'Inputs'
+# subdirectories contain auxiliary inputs for various tests in their parent
+# directories.
+config.excludes = ['Inputs']
+
# test_source_root: The root path where tests are located.
config.test_source_root = os.path.dirname(__file__)
More information about the llvm-commits
mailing list