diff options
author | Tanya Lattner <tonic@nondot.org> | 2008-03-25 04:26:08 +0000 |
---|---|---|
committer | Tanya Lattner <tonic@nondot.org> | 2008-03-25 04:26:08 +0000 |
commit | 348c61831624e93741f08edec256ba20b94ba7b4 (patch) | |
tree | e662b3ee5539d7594ab49eda3eae140424ce499d /test/lib | |
parent | 0013e453bf3652f7341a3ba1149ba173891c1c79 (diff) | |
download | external_llvm-348c61831624e93741f08edec256ba20b94ba7b4.zip external_llvm-348c61831624e93741f08edec256ba20b94ba7b4.tar.gz external_llvm-348c61831624e93741f08edec256ba20b94ba7b4.tar.bz2 |
Byebye llvm-upgrade!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48762 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/lib')
-rw-r--r-- | test/lib/llvm2cpp.exp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/test/lib/llvm2cpp.exp b/test/lib/llvm2cpp.exp index b4141ac..a0a0232 100644 --- a/test/lib/llvm2cpp.exp +++ b/test/lib/llvm2cpp.exp @@ -12,7 +12,6 @@ proc llvm2cpp-test { files } { set llvm2cpp [file join $llvmtoolsdir llvm2cpp ] set llvmas [file join $llvmtoolsdir llvm-as ] set llvmdis [file join $llvmtoolsdir llvm-dis ] - set llvmupgrade [ file join $llvmtoolsdir llvm-upgrade ] #Make Output Directory if it does not exist already if { [file exists path] } { @@ -46,22 +45,10 @@ proc llvm2cpp-test { files } { 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. + # Run llvm-as/llvm-dis + set pipeline llvm-as|llvm-dis 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 ] - } + exec -keepnewline $llvmas < $test -o - | $llvmdis -f -o $assembly 2>/dev/null } msg ] if { $retval != 0 } { fail "$test: $pipeline returned $retval\n$msg" |