diff options
| -rw-r--r-- | test/C++Frontend/2006-11-30-NoCompileUnit.cpp | 10 | ||||
| -rw-r--r-- | test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx | 2 | ||||
| -rw-r--r-- | test/Feature/float.ll | 6 | ||||
| -rw-r--r-- | test/Feature/inlineasm.ll | 6 | ||||
| -rw-r--r-- | test/Feature/llvm2cpp.ll | 2 | ||||
| -rw-r--r-- | test/lib/llvm.exp | 4 |
6 files changed, 15 insertions, 15 deletions
diff --git a/test/C++Frontend/2006-11-30-NoCompileUnit.cpp b/test/C++Frontend/2006-11-30-NoCompileUnit.cpp index 993ceb4..4203ab1 100644 --- a/test/C++Frontend/2006-11-30-NoCompileUnit.cpp +++ b/test/C++Frontend/2006-11-30-NoCompileUnit.cpp @@ -1,12 +1,12 @@ // This is a regression test on debug info to make sure we don't hit a compile // unit size issue with gdb. // RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | \ -// RUN: llc --disable-fp-elim -o Output/NoCompileUnit.s -f -// RUN: as Output/NoCompileUnit.s -o Output/NoCompileUnit.o -// RUN: g++ Output/NoCompileUnit.o -o Output/NoCompileUnit.exe +// RUN: llc --disable-fp-elim -o NoCompileUnit.s -f +// RUN: as NoCompileUnit.s -o NoCompileUnit.o +// RUN: g++ NoCompileUnit.o -o NoCompileUnit.exe // RUN: echo {break main\nrun\np NoCompileUnit::pubname} > %t2 -// RUN: gdb -q -batch -n -x %t2 Output/NoCompileUnit.exe | \ -// RUN: tee Output/NoCompileUnit.out | not grep {"low == high"} +// RUN: gdb -q -batch -n -x %t2 NoCompileUnit.exe | \ +// RUN: tee NoCompileUnit.out | not grep {"low == high"} // XFAIL: alpha|ia64|arm diff --git a/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx b/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx index d7f8e56..f49b98c 100644 --- a/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx +++ b/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx @@ -1,7 +1,7 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=c > %t1.cbe.c ; RUN: gcc -B/usr/bin/ %t1.cbe.c -o %t1.cbe -; RUN: %t1.cbe +; RUN: ./%t1.cbe bool %doTest(ubyte %x) { %dec.0 = add ubyte %x, 255 diff --git a/test/Feature/float.ll b/test/Feature/float.ll index 5a53c2c0..c1532eb 100644 --- a/test/Feature/float.ll +++ b/test/Feature/float.ll @@ -1,6 +1,6 @@ -; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > Output/t1.ll -; RUN: llvm-as Output/t1.ll -o - | llvm-dis > Output/t2.ll -; RUN: diff Output/t1.ll Output/t2.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > t1.ll +; RUN: llvm-as t1.ll -o - | llvm-dis > t2.ll +; RUN: diff t1.ll t2.ll %F1 = global float 0x4010000000000000 %D1 = global double 0x4010000000000000 diff --git a/test/Feature/inlineasm.ll b/test/Feature/inlineasm.ll index c8f59f2..fdb4657 100644 --- a/test/Feature/inlineasm.ll +++ b/test/Feature/inlineasm.ll @@ -1,7 +1,7 @@ ; RUN: llvm-upgrade %s -o - | llvm-as -o /dev/null -f -; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > Output/t1.ll -; RUN: llvm-as Output/t1.ll -o - | llvm-dis > Output/t2.ll -; RUN: diff Output/t1.ll Output/t2.ll +; RUN: llvm-upgrade < %s | llvm-as | llvm-dis > t1.ll +; RUN: llvm-as t1.ll -o - | llvm-dis > t2.ll +; RUN: diff t1.ll t2.ll module asm "this is an inline asm block" diff --git a/test/Feature/llvm2cpp.ll b/test/Feature/llvm2cpp.ll index 4cfb66d..88cfa34 100644 --- a/test/Feature/llvm2cpp.ll +++ b/test/Feature/llvm2cpp.ll @@ -1,7 +1,7 @@ ; RUN: llvm-as < %s | llvm-dis > %t1.ll ; RUN: llvm-as < %s | llvm2cpp -gen-program -o %t2.cpp - -f ; RUN: %link -o %t2.exe %t2.cpp -lLLVMCore -lLLVMSupport -lLLVMSystem -lstdc++ -; RUN: %t2.exe > %t2.ll +; RUN: ./%t2.exe > %t2.ll ; RUN: diff %t1.ll %t2.ll @X = global i32 4, align 16 ; <i32*> [#uses=0] diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp index a64692d..9a85a1c 100644 --- a/test/lib/llvm.exp +++ b/test/lib/llvm.exp @@ -46,7 +46,6 @@ proc substitute { line test tmpFile } { global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir set path [file join $srcdir $subdir] - set tmp [file join Output $tmpFile] # Substitute all Tcl variables. set new_line [subst $line ] @@ -72,7 +71,7 @@ proc substitute { line test tmpFile } { #replace %s with filename regsub -all {%s} $new_line $test new_line #replace %t with temp filenames - regsub -all {%t} $new_line [file join Output $tmpFile] new_line + regsub -all {%t} $new_line $tmpFile new_line #replace %% with % regsub -all {%%} $new_line % new_line return $new_line @@ -94,6 +93,7 @@ proc RunLLVMTests { test_source_files } { } file mkdir Output + cd Output foreach test $test_source_files { #Should figure out best way to set the timeout |