diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2009-03-19 20:27:23 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2009-03-19 20:27:23 +0000 |
| commit | 817046e1f1945ce2e3aaf6239e849d5ad3112d26 (patch) | |
| tree | b39c281191c120a1970497413f9bc5b65daba18a /test/lib/llvm.exp | |
| parent | 8be1ac213b20c5f4f6126d6ef955a9997f150ead (diff) | |
| download | llvm-817046e1f1945ce2e3aaf6239e849d5ad3112d26.tar.gz llvm-817046e1f1945ce2e3aaf6239e849d5ad3112d26.tar.bz2 llvm-817046e1f1945ce2e3aaf6239e849d5ad3112d26.tar.xz | |
More makefile changes to allow dejagnu tests to pass when system tools default to a different target from the llvm configuration (e.g. 64-bit gcc and 32-bit llvm).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@67334 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/lib/llvm.exp')
| -rw-r--r-- | test/lib/llvm.exp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp index 254995bc4a..2ef7e6fefb 100644 --- a/test/lib/llvm.exp +++ b/test/lib/llvm.exp @@ -48,8 +48,8 @@ proc execOneLine { test PRS outcome lineno line } { proc substitute { line test tmpFile } { global srcroot objroot srcdir objdir subdir target_triplet prcontext global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlc - global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir llvmdsymutil - global valgrind grep gas + global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir + global llvmdsymutil valgrind grep gas bugpoint_topts set path [file join $srcdir $subdir] # Substitute all Tcl variables. @@ -77,6 +77,8 @@ proc substitute { line test tmpFile } { regsub -all {%llvmdsymutil} $new_line "$llvmdsymutil" new_line #replace %llvmlibsdir with configure library directory regsub -all {%llvmlibsdir} $new_line "$llvmlibsdir" new_line + #replace %bugpoint_tops with actual bugpoint target options + regsub -all {%bugpoint_tops} $new_line "$bugpoint_topts" new_line #replace %p with path to source, regsub -all {%p} $new_line [file join $srcdir $subdir] new_line #replace %s with filename |