diff options
author | Reid Spencer <rspencer@reidspencer.com> | 2006-05-30 23:07:17 +0000 |
---|---|---|
committer | Reid Spencer <rspencer@reidspencer.com> | 2006-05-30 23:07:17 +0000 |
commit | 226368ff4e530d16b9368ec1ad2b41fbe9182b0f (patch) | |
tree | 1508cabeeea09ad5c83851980f9ae140694ba9e2 /test/lib | |
parent | a0eaf2d0c5a7e3230146ae699b99f324557cf7d3 (diff) | |
download | llvm-226368ff4e530d16b9368ec1ad2b41fbe9182b0f.tar.gz llvm-226368ff4e530d16b9368ec1ad2b41fbe9182b0f.tar.bz2 llvm-226368ff4e530d16b9368ec1ad2b41fbe9182b0f.tar.xz |
1. No need to thwart this test with an environment variable. Turning it off
is the default and handled by the makefile system and runtest
2. Redirect stderr of llvm-as and llvm2cpp so that warning messages about
instrinsics don't cause Tcl to report the run as failed.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28576 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/lib')
-rw-r--r-- | test/lib/llvm2cpp.exp | 117 |
1 files changed, 60 insertions, 57 deletions
diff --git a/test/lib/llvm2cpp.exp b/test/lib/llvm2cpp.exp index 2b954dfe1d..9450fe92a7 100644 --- a/test/lib/llvm2cpp.exp +++ b/test/lib/llvm2cpp.exp @@ -6,73 +6,76 @@ # the original input to llvm2cpp. proc llvm2cpp-test { files } { -# if { $env(LLVM_RUNLLVM2CPP_TEST) == 1 } { - global subdir llvmtoolsdir llvmlibsdir objdir srcdir objroot srcroot - set timeout 30 - set path [file join $objdir $subdir] - set llvm2cpp [file join $llvmtoolsdir llvm2cpp ] - set llvmas [file join $llvmtoolsdir llvm-as ] - set llvmdis [file join $llvmtoolsdir llvm-dis ] + global subdir llvmtoolsdir llvmlibsdir objdir srcdir objroot srcroot + set timeout 30 + set path [file join $objdir $subdir] + set llvm2cpp [file join $llvmtoolsdir llvm2cpp ] + set llvmas [file join $llvmtoolsdir llvm-as ] + set llvmdis [file join $llvmtoolsdir llvm-dis ] - #Make Output Directory if it does not exist already - if { [file exists path] } { - cd $path - } else { - file mkdir $path - cd $path - } - - file mkdir Output - - foreach test $files { - - set filename [file tail $test] - set generated [file join Output $filename.cpp] - set executable [file join Output $filename.exe] - set output [file join Output $filename.gen] - set assembly [file join Output $filename.asm] - set testname [file rootname $filename] + #Make Output Directory if it does not exist already + if { [file exists path] } { + cd $path + } else { + file mkdir $path + cd $path + } + + file mkdir Output - set retval [ catch { - exec -keepnewline $llvmas $test -o - | $llvmdis -f -o $assembly } msg ] + foreach test $files { + + set filename [file tail $test] + set generated [file join Output $filename.cpp] + set executable [file join Output $filename.exe] + set output [file join Output $filename.gen] + set assembly [file join Output $filename.asm] + set testname [file rootname $filename] + set bytecode [file join Output $filename.bc] - if { $retval != 0 } { - fail "$test: llvm-as/llvm-dis returned $retval\n$msg" - continue - } + # Note that the stderr for llvm-as must be redirected to /dev/null because + # otherwise exec will see the msgs and return 1 even though they are only + # warnings. If real errors are generated on stderr then llvm-as will return + # a non-zero retval anyway so we're good. + set retval [ catch { + exec -keepnewline $llvmas $test -o - | $llvmdis -f -o $assembly 2>/dev/null } msg ] - set retval [ catch { - exec -keepnewline $llvm2cpp -f -o $generated < $test } msg] + if { $retval != 0 } { + fail "$test: llvm-as/llvm-dis returned $retval\n$msg" + continue + } - if { $retval != 0 } { - fail "$test: llvm2cpp returned $retval\n$msg" - continue - } + set retval [ catch { + exec -keepnewline $llvm2cpp -f -o $generated < $test 2>/dev/null } msg] - set retval [ catch { - exec -keepnewline gcc -g -D__STDC_LIMIT_MACROS -o $executable $generated -I$srcroot/include -I$objroot/include -L$llvmlibsdir $llvmlibsdir/LLVMCore.o -lLLVMSupport $llvmlibsdir/LLVMbzip2.o -lLLVMSystem -lstdc++ } msg ] - if { $retval != 0 } { - fail "$test: gcc returned $retval\n$msg" - continue - } + if { $retval != 0 } { + fail "$test: llvm2cpp returned $retval\n$msg" + continue + } + + set retval [ catch { + exec -keepnewline gcc -g -D__STDC_LIMIT_MACROS -o $executable $generated -I$srcroot/include -I$objroot/include -L$llvmlibsdir $llvmlibsdir/LLVMCore.o -lLLVMSupport $llvmlibsdir/LLVMbzip2.o -lLLVMSystem -lstdc++ } msg ] + if { $retval != 0 } { + fail "$test: gcc returned $retval\n$msg" + continue + } - set retval [ catch { exec -keepnewline $executable > $output } msg ] - if { $retval != 0 } { - set execname [file tail $executable] - fail "$test: $execname returned $retval:\n$msg" - continue - } + set retval [ catch { exec -keepnewline $executable > $output } msg ] + if { $retval != 0 } { + set execname [file tail $executable] + fail "$test: $execname returned $retval:\n$msg" + continue + } - set retval [ catch { - exec -keepnewline diff $assembly $output } msg ] + set retval [ catch { + exec -keepnewline diff $assembly $output } msg ] - if { $retval != 0 } { - fail "$test: diff returned $retval:\n$msg" - continue - } - pass "$test" + if { $retval != 0 } { + fail "$test: diff returned $retval:\n$msg" + continue } -# } + pass "$test" + } } |