RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-01-19 10:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update the way llvm2cpp tests are done:

Browse Source 
1. Make sure bytecode/assembly inputs are always redirected stdin so that
   the module name is <stdin>. This helps not get false negatives when the
   diff is done.
2. Scan the test file to determine if llvm-upgrade needs to be run.
3. Avoid running testings that are XFAIL'd because they'll cause a failure
   when run for llvm2cpp.
4. Get some better error message output.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35914 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2007-04-11 17:56:23 +00:00
parent 14f6dbff30
commit 0aac889d71
1 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
test/lib/llvm2cpp.exp
View File

@ -12,6 +12,7 @@ proc llvm2cpp-test { files } {
set llvm2cpp [file join $llvmtoolsdir llvm2cpp ] set llvm2cpp [file join $llvmtoolsdir llvm2cpp ]
set llvmas [file join $llvmtoolsdir llvm-as ] set llvmas [file join $llvmtoolsdir llvm-as ]
set llvmdis [file join $llvmtoolsdir llvm-dis ] set llvmdis [file join $llvmtoolsdir llvm-dis ]
set llvmupgrade [ file join $llvmtoolsdir llvm-upgrade ]
#Make Output Directory if it does not exist already #Make Output Directory if it does not exist already
if { [file exists path] } { if { [file exists path] } {
@ -33,20 +34,51 @@ proc llvm2cpp-test { files } {
set testname [file rootname $filename] set testname [file rootname $filename]
set bytecode [file join Output $filename.bc] set bytecode [file join Output $filename.bc]
# Note that the stderr for llvm-as must be redirected to /dev/null because # Note that the stderr for llvm-as, etc. must be redirected to /dev/null
# otherwise exec will see the msgs and return 1 even though they are only # because otherwise exec will see the msgs and return 1 even though they
# warnings. If real errors are generated on stderr then llvm-as will return # are only warnings. If real errors are generated on stderr then llvm-as
# a non-zero retval anyway so we're good. # will return a non-zero retval anyway so we're good.
# Scan the test file to see if there's an XFAIL file. If so, don't run it
set retval [ catch { set retval [ catch {
exec -keepnewline $llvmas $test -o - | $llvmdis -f -o $assembly 2>/dev/null } msg ] exec -keepnewline grep XFAIL $test 2>/dev/null } msg ]
if { $retval == 0 } {
continue;
}
# Scan the test file to see if there's a line with "lvm-upgrade" in it.
# If so, run llvm-upgrade first or else llvm-as will fail on it.
set retval [ catch {
exec -keepnewline grep llvm-upgrade $test 2>/dev/null } msg ]
if { $retval == 0 } {
# In this case we must run llvm-upgrade before llvm-as
set pipeline llvm-upgrade|llvm-as|llvm-dis
set retval [ catch {
exec -keepnewline $llvmupgrade < $test -o - | $llvmas | $llvmdis -f -o $assembly 2>/dev/null } msg ]
} else {
# llvm-upgrade not necessary, just llvm-as/llvm-dis
set pipeline llvm-as|llvm-dis
set retval [ catch {
exec -keepnewline $llvmas < $test -o - | $llvmdis -f -o $assembly 2>/dev/null } msg ]
}
if { $retval != 0 } { if { $retval != 0 } {
fail "$test: llvm-as/llvm-dis returned $retval\n$msg" fail "$test: $pipeline returned $retval\n$msg"
continue
}
# Build bytecode for llvm2cpp input
set retval [ catch {
exec -keepnewline $llvmas < $assembly > $bytecode 2>/dev/null } msg ]
if { $retval != 0 } {
fail "$test: llvm-as returned $retval\n$msg"
continue continue
} }
set retval [ catch { set retval [ catch {
exec -keepnewline $llvm2cpp -f -o $generated < $test 2>/dev/null } msg] exec -keepnewline $llvm2cpp -f -o $generated < $bytecode 2>/dev/null } msg]
if { $retval != 0 } { if { $retval != 0 } {
fail "$test: llvm2cpp returned $retval\n$msg" fail "$test: llvm2cpp returned $retval\n$msg"