diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-02-23 07:56:28 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-02-23 07:56:28 +0000 |
| commit | 3d4d01bd39653ca869c4fca211fa861bfcf33dcc (patch) | |
| tree | 067ca8ef848679b076a9decaf616a70b91fc05e3 /test/lib | |
| parent | 99d9863cce6a460aac7b4330084044ca7a11ab43 (diff) | |
| download | external_llvm-3d4d01bd39653ca869c4fca211fa861bfcf33dcc.zip external_llvm-3d4d01bd39653ca869c4fca211fa861bfcf33dcc.tar.gz external_llvm-3d4d01bd39653ca869c4fca211fa861bfcf33dcc.tar.bz2 | |
Eliminate llvmgcc_version testing variable.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96908 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/lib')
| -rw-r--r-- | test/lib/llvm.exp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp index 941b4f1..19a2729 100644 --- a/test/lib/llvm.exp +++ b/test/lib/llvm.exp @@ -47,7 +47,7 @@ proc execOneLine { test PRS outcome lineno line } { # cases. proc substitute { line test tmpFile } { global srcroot objroot srcdir objdir subdir target_triplet - global llvmgcc llvmgxx llvmgcc_version ocamlopt + global llvmgcc llvmgxx ocamlopt global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir global llvmdsymutil valgrind grep gas bugpoint_topts set path [file join $srcdir $subdir] @@ -119,7 +119,7 @@ proc substitute { line test tmpFile } { # This procedure runs the set of tests for the test_source_files array. proc RunLLVMTests { test_source_files } { - global srcroot objroot srcdir objdir subdir target_triplet llvmgcc_version + global srcroot objroot srcdir objdir subdir target_triplet set timeout 60 set path [file join $objdir $subdir] @@ -194,12 +194,6 @@ proc RunLLVMTests { test_source_files } { if {$targetPASS != 1} { set outcome XFAIL } - } elseif { [regexp {llvmgcc(([0-9]+)|([0-9]+[.][0-9]+))} $target match submatch submatch2] } { - if { [regexp ^($submatch)$|^(($submatch)(\.)) $llvmgcc_version match] } { - if {$targetPASS != 1} { - set outcome XFAIL - } - } } } } elseif {[regexp {XTARGET:[ *](.+)} $line match targets]} { @@ -213,11 +207,6 @@ proc RunLLVMTests { test_source_files } { } elseif { [regexp $target $target_triplet match] } { set targetPASS 1 set outcome PASS - } elseif { [regexp {llvmgcc(([0-9]+)|([0-9]+[.][0-9]+))} $target match submatch submatch2] } { - if { [regexp ^($submatch)$|^(($submatch)(\.)) $llvmgcc_version match] } { - set targetPASS 1 - set outcome PASS - } } } } |