Checkin of autoconf-style object root.

Updated TestRunner tests so that they work correctly in a separate object root
directory.

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

diff --git a/test/Assembler/2002-04-07-HexFloatConstants.llx b/test/Assembler/2002-04-07-HexFloatConstants.llx
index 422d3b4700e5c7bbb685d6d00a2acbaffa526cb0..5411faad3ba52acd8038f448dac06ef2a5e45c95 100644 (file)
--- a/test/Assembler/2002-04-07-HexFloatConstants.llx
+++ b/test/Assembler/2002-04-07-HexFloatConstants.llx
@@ -5,9 +5,9 @@
 ; of the bug that was causing the Olden Health benchmark to output incorrect
 ; results!
 ;
-; RUN: as < %s | opt -constprop | dis > Output/%s && \
-; RUN: as < %s | dis | as | opt -constprop | dis > Output/%s2 && \
-; RUN: diff Output/%s Output/%s2
+; RUN: as < %s | opt -constprop | dis > s1 && \
+; RUN: as < %s | dis | as | opt -constprop | dis > s2 && \
+; RUN: diff s1 s2
 
 implementation
 

diff --git a/test/CBackend/2003-06-23-PromotedExprs.llx b/test/CBackend/2003-06-23-PromotedExprs.llx
index 0723d6baac830d479017849feccc2e657250b3f9..f678b83c3491714daff139271de0c1f66ab57b4c 100644 (file)
--- a/test/CBackend/2003-06-23-PromotedExprs.llx
+++ b/test/CBackend/2003-06-23-PromotedExprs.llx
@@ -1,7 +1,7 @@
 
-; RUN: as < %s | dis -c > Output/%s.cbe.c
-; RUN: gcc -B/usr/bin/ Output/%s.cbe.c -o Output/%s.cbe
-; RUN: Output/%s.cbe
+; RUN: as < %s | dis -c > f1.cbe.c
+; RUN: gcc -B/usr/bin/ f1.cbe.c -o f1.cbe
+; RUN: ./f1.cbe
 
 bool %doTest(ubyte %x) {
        %dec.0 = add ubyte %x, 255

diff --git a/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx b/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx
index 0723d6baac830d479017849feccc2e657250b3f9..f678b83c3491714daff139271de0c1f66ab57b4c 100644 (file)
--- a/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx
+++ b/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx
@@ -1,7 +1,7 @@
 
-; RUN: as < %s | dis -c > Output/%s.cbe.c
-; RUN: gcc -B/usr/bin/ Output/%s.cbe.c -o Output/%s.cbe
-; RUN: Output/%s.cbe
+; RUN: as < %s | dis -c > f1.cbe.c
+; RUN: gcc -B/usr/bin/ f1.cbe.c -o f1.cbe
+; RUN: ./f1.cbe
 
 bool %doTest(ubyte %x) {
        %dec.0 = add ubyte %x, 255

diff --git a/test/Linker/2002-07-17-GlobalFail.ll b/test/Linker/2002-07-17-GlobalFail.ll
index bc12fe9f42f09937423c9b4273b57df1f77ffa88..68726dac84d122fce1bd2fe7284e1c60fcdd079b 100644 (file)
--- a/test/Linker/2002-07-17-GlobalFail.ll
+++ b/test/Linker/2002-07-17-GlobalFail.ll
@@ -1,6 +1,6 @@
-; RUN: as < %s > Output/%s.bc
-; RUN: echo | as > Output/%s.tmp.bc
-; RUN: link Output/%s.tmp.bc Output/%s.bc
+; RUN: as < %s > %t.bc
+; RUN: echo | as > %t.tmp.bc
+; RUN: link %t.tmp.bc %t.bc
 
 %X = constant int 5
 %Y = internal global [2 x int*] [ int* %X, int * %X]

diff --git a/test/Linker/2002-07-17-LinkTest2.ll b/test/Linker/2002-07-17-LinkTest2.ll
index c1db0634b6486fbf3ce88fb6203d85f767dc96a7..80286eb01f6445542b6a3936674f4f3fff11f476 100644 (file)
--- a/test/Linker/2002-07-17-LinkTest2.ll
+++ b/test/Linker/2002-07-17-LinkTest2.ll
@@ -1,8 +1,8 @@
 ; This fails linking when it is linked with an empty file as the first object file
 
-; RUN: as > Output/LinkTest1.bc < /dev/null
-; RUN: as < %s > Output/LinkTest2.bc
-; RUN: link Output/LinkTest[12].bc
+; RUN: as > %t1.bc < /dev/null
+; RUN: as < %s > %t2.bc
+; RUN: link %t[12].bc
 
 %work = global int (int, int)* %zip
 

diff --git a/test/Linker/2002-08-20-ConstantExpr.ll b/test/Linker/2002-08-20-ConstantExpr.ll
index 3f1b4bf90a7b0e9b1c6da3b49a7501f8dcc87651..da81af31f1cc6925ef04f3fa487f531dd323cda9 100644 (file)
--- a/test/Linker/2002-08-20-ConstantExpr.ll
+++ b/test/Linker/2002-08-20-ConstantExpr.ll
@@ -1,8 +1,8 @@
 ; This fails linking when it is linked with an empty file as the first object file
 
-; RUN: as > Output/%s.LinkTest.bc < /dev/null
-; RUN: as < %s > Output/%s.bc
-; RUN: link Output/%s.LinkTest.bc Output/%s.bc
+; RUN: as > %t.LinkTest.bc < /dev/null
+; RUN: as < %s > %t.bc
+; RUN: link %t.LinkTest.bc %t.bc
 
 %work = global int 4
 %test = global int* getelementptr( int* %work, long 1)

diff --git a/test/Linker/2003-01-30-LinkerRename.ll b/test/Linker/2003-01-30-LinkerRename.ll
index 4956f7c003a6dc6131e4d874615f69798c9d858d..3cf8f7855350c36e0031f1e9359b639ba7ea2737 100644 (file)
--- a/test/Linker/2003-01-30-LinkerRename.ll
+++ b/test/Linker/2003-01-30-LinkerRename.ll
@@ -1,9 +1,9 @@
 ; This fails because the linker renames the external symbol not the internal 
 ; one...
 
-; RUN: echo "implementation internal int %foo() { ret int 7 }" | as > Output/%s.1.bc
-; RUN: as < %s > Output/%s.2.bc
-; RUN: link Output/%s.[12].bc | dis | grep '%foo()' | grep -v internal
+; RUN: echo "implementation internal int %foo() { ret int 7 }" | as > %t.1.bc
+; RUN: as < %s > %t.2.bc
+; RUN: link %t.[12].bc | dis | grep '%foo()' | grep -v internal
 
 implementation
 int %foo() { ret int 0 }

diff --git a/test/Linker/2003-01-30-LinkerTypeRename.ll b/test/Linker/2003-01-30-LinkerTypeRename.ll
index a8837f7770e1240ae83e57c3a723a29254110ee3..b0bd7640eb3590eb374edd3841b9329866c4b9ef 100644 (file)
--- a/test/Linker/2003-01-30-LinkerTypeRename.ll
+++ b/test/Linker/2003-01-30-LinkerTypeRename.ll
@@ -1,9 +1,9 @@
 ; This fails because the linker renames the non-opaque type not the opaque 
 ; one...
 
-; RUN: echo "%Ty = type opaque" | as > Output/%s.1.bc
-; RUN: as < %s > Output/%s.2.bc
-; RUN: link Output/%s.[12].bc | dis | grep '%Ty ' | grep -v opaque
+; RUN: echo "%Ty = type opaque" | as > %t.1.bc
+; RUN: as < %s > %t.2.bc
+; RUN: link %t.[12].bc | dis | grep '%Ty ' | grep -v opaque
 
 %Ty = type int
 

diff --git a/test/Linker/2003-04-21-Linkage.ll b/test/Linker/2003-04-21-Linkage.ll
index 58493f9ecebcb6e2cf4f3017aac6b18fccbd64d0..96fb5c048fb998e9da7c083d8204ffc156d86ea4 100644 (file)
--- a/test/Linker/2003-04-21-Linkage.ll
+++ b/test/Linker/2003-04-21-Linkage.ll
@@ -1,6 +1,6 @@
-; RUN: echo "%X = linkonce global int 5  implementation linkonce int %foo() { ret int 7 }" | as > Output/%s.1.bc
-; RUN: as < %s > Output/%s.2.bc
-; RUN: link Output/%s.[12].bc 
+; RUN: echo "%X = linkonce global int 5  implementation linkonce int %foo() { ret int 7 }" | as > %t.1.bc
+; RUN: as < %s > %t.2.bc
+; RUN: link %t.[12].bc 
 %X = external global int 
 
 implementation

diff --git a/test/Linker/2003-04-23-LinkOnceLost.ll b/test/Linker/2003-04-23-LinkOnceLost.ll
index 2d99b60da46aad96aba23880b27e883f638cc150..cae03c6f8e2fddb69b0ad38b65c5d6cea62d0162 100644 (file)
--- a/test/Linker/2003-04-23-LinkOnceLost.ll
+++ b/test/Linker/2003-04-23-LinkOnceLost.ll
@@ -1,8 +1,8 @@
 ; This fails because the linker renames the non-opaque type not the opaque 
 ; one...
 
-; RUN: echo "implementation linkonce void %foo() { ret void } " | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc | dis | grep foo | grep linkonce
+; RUN: echo "implementation linkonce void %foo() { ret void } " | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc | dis | grep foo | grep linkonce
 
 declare void %foo()

diff --git a/test/Linker/2003-04-26-NullPtrLinkProblem.ll b/test/Linker/2003-04-26-NullPtrLinkProblem.ll
index 4c3f572029689d6c142b17ed1cb4239ee42b3827..53c2f4ccbd2aadcf5ff2da7342d6a56a1588372a 100644 (file)
--- a/test/Linker/2003-04-26-NullPtrLinkProblem.ll
+++ b/test/Linker/2003-04-26-NullPtrLinkProblem.ll
@@ -1,9 +1,9 @@
 ; This one fails because the LLVM runtime is allowing two null pointers of
 ; the same type to be created!
 
-; RUN: echo "%T = type int" | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc
+; RUN: echo "%T = type int" | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc
 
 %T = type opaque
 

diff --git a/test/Linker/2003-05-15-TypeProblem.ll b/test/Linker/2003-05-15-TypeProblem.ll
index 37bdbfd3bff9f9bf68b489e6b97872cc8c1bf287..74c3fee38b67109c6f648b227a27b90298baff1b 100644 (file)
--- a/test/Linker/2003-05-15-TypeProblem.ll
+++ b/test/Linker/2003-05-15-TypeProblem.ll
@@ -1,9 +1,9 @@
 ; This one fails because the LLVM runtime is allowing two null pointers of
 ; the same type to be created!
 
-; RUN: echo "%S = type { %T*} %T = type opaque" | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc
+; RUN: echo "%S = type { %T*} %T = type opaque" | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc
 
 %S = type { %T* }
 %T = type int

diff --git a/test/Linker/2003-05-31-LinkerRename.ll b/test/Linker/2003-05-31-LinkerRename.ll
index 1b4206455047e22e6679661cc854c3640d320a30..ac11f190f6a679aee0f2d3405d5e4fd8b405bd88 100644 (file)
--- a/test/Linker/2003-05-31-LinkerRename.ll
+++ b/test/Linker/2003-05-31-LinkerRename.ll
@@ -3,9 +3,9 @@
 ; a program that already has an external declaration for the function name, we must
 ; rename the internal function to something that does not conflict.
 
-; RUN: echo "implementation internal int %foo() { ret int 7 }" | as > Output/%s.1.bc
-; RUN: as < %s > Output/%s.2.bc
-; RUN: link Output/%s.[12].bc | dis | grep 'internal' | not grep '%foo('
+; RUN: echo "implementation internal int %foo() { ret int 7 }" | as > %t.1.bc
+; RUN: as < %s > %t.2.bc
+; RUN: link %t.[12].bc | dis | grep 'internal' | not grep '%foo('
 
 implementation
 declare int %foo() 

diff --git a/test/Linker/2003-06-02-TypeResolveProblem.ll b/test/Linker/2003-06-02-TypeResolveProblem.ll
index eee1135dfb466748804bbaee993c36fa2941c91c..796cb8aa08ed29978432b93ba87c2bfca3ff8c33 100644 (file)
--- a/test/Linker/2003-06-02-TypeResolveProblem.ll
+++ b/test/Linker/2003-06-02-TypeResolveProblem.ll
@@ -1,6 +1,6 @@
-; RUN: echo "%T = type opaque" | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc
+; RUN: echo "%T = type opaque" | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc
 
 %T = type opaque
 %a = constant { %T* }  { %T* null }

diff --git a/test/Linker/2003-06-02-TypeResolveProblem2.ll b/test/Linker/2003-06-02-TypeResolveProblem2.ll
index 41a49c1c990282b0d1a10c8f3285816f172939b9..7592b2ce5a9b3065141f762682201675c16938dd 100644 (file)
--- a/test/Linker/2003-06-02-TypeResolveProblem2.ll
+++ b/test/Linker/2003-06-02-TypeResolveProblem2.ll
@@ -1,6 +1,6 @@
-; RUN: echo "%T = type int" | as > Output/%s.1.bc
-; RUN: as < %s > Output/%s.2.bc
-; RUN: link Output/%s.[12].bc
+; RUN: echo "%T = type int" | as > %t.1.bc
+; RUN: as < %s > %t.2.bc
+; RUN: link %t.[12].bc
 
 %T = type opaque
 

diff --git a/test/Linker/AppendingLinkage.ll b/test/Linker/AppendingLinkage.ll
index de925a7d6c97ca6b3585d6500018aa7c863d15b6..0019e6cdea917e8ee364f954098f3f399f0f8445 100644 (file)
--- a/test/Linker/AppendingLinkage.ll
+++ b/test/Linker/AppendingLinkage.ll
@@ -1,8 +1,8 @@
 ; Test that appending linkage works correctly.
 
-; RUN: echo "%X = appending global [1x int] [int 8]" | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc | dis | grep 7 | grep 4 | grep 8
+; RUN: echo "%X = appending global [1x int] [int 8]" | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc | dis | grep 7 | grep 4 | grep 8
 
 %X = appending global [2 x int] [int 7, int 4]
 

diff --git a/test/Linker/AppendingLinkage2.ll b/test/Linker/AppendingLinkage2.ll
index 8a73c9d7c89335dfc0e1a6e435909b4e387e431d..cef51191a810b2f58acd1452c3127e9d4a13e1ac 100644 (file)
--- a/test/Linker/AppendingLinkage2.ll
+++ b/test/Linker/AppendingLinkage2.ll
@@ -1,7 +1,7 @@
 ; Test that appending linkage works correctly when arrays are the same size.
 
-; RUN: echo "%X = appending global [1x int] [int 8]" | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc | dis | grep 7 | grep 8
+; RUN: echo "%X = appending global [1x int] [int 8]" | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc | dis | grep 7 | grep 8
 
 %X = appending global [1 x int] [int 7]

diff --git a/test/Linker/LinkOnce.ll b/test/Linker/LinkOnce.ll
index 01ec9862ab620af693810fa10bbb2e7ce490dd9f..5d731b37c472f520d002cbb308461aed304853cd 100644 (file)
--- a/test/Linker/LinkOnce.ll
+++ b/test/Linker/LinkOnce.ll
@@ -1,8 +1,8 @@
 ; This fails because the linker renames the non-opaque type not the opaque 
 ; one...
 
-; RUN: echo "%X = linkonce global int 8" | as > Output/%s.2.bc
-; RUN: as < %s > Output/%s.1.bc
-; RUN: link Output/%s.[12].bc | dis
+; RUN: echo "%X = linkonce global int 8" | as > %t.2.bc
+; RUN: as < %s > %t.1.bc
+; RUN: link %t.[12].bc | dis
 
 %X = linkonce global int 7

diff --git a/test/Linker/testlink1.ll b/test/Linker/testlink1.ll
index 3f07213cedc3d26bfebe780d701e02abd938fdc7..2b40f3514b43bd0e5516784a91851a38f3f4e86e 100644 (file)
--- a/test/Linker/testlink1.ll
+++ b/test/Linker/testlink1.ll
@@ -1,6 +1,6 @@
-; RUN: as < %s > Output/%s.bc
-; RUN: as < testlink2.ll > Output/testlink2.bc
-; RUN: link Output/%s.bc Output/testlink2.bc
+; RUN: as < %s > %t.bc
+; RUN: as < `dirname %s`/testlink2.ll > %t2.bc
+; RUN: link %t.bc %t2.bc
 
 %MyVar     = external global int
 %MyIntList = global { \2 *, int } { { \2, int }* null, int 17 }