diff options
author | Nick Lewycky <nicholas@mxc.ca> | 2009-03-20 07:56:31 +0000 |
---|---|---|
committer | Nick Lewycky <nicholas@mxc.ca> | 2009-03-20 07:56:31 +0000 |
commit | 18ca80cdda1e138e6ad47d4ac19df9ac83f42d37 (patch) | |
tree | 3177d4d54e93af33a511954e8576dcefabdeefea /llvm/test/lib | |
parent | 0e75994e8bfd5fe8fee2ef0ad2a34aabceb27bab (diff) | |
download | bcm5719-llvm-18ca80cdda1e138e6ad47d4ac19df9ac83f42d37.tar.gz bcm5719-llvm-18ca80cdda1e138e6ad47d4ac19df9ac83f42d37.zip |
Revert r67334 and r37349 which break "make check" on Linux.
llvm-svn: 67368
Diffstat (limited to 'llvm/test/lib')
-rw-r--r-- | llvm/test/lib/llvm.exp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/llvm/test/lib/llvm.exp b/llvm/test/lib/llvm.exp index d2ddb8f757f..254995bc4ae 100644 --- a/llvm/test/lib/llvm.exp +++ b/llvm/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 - global llvmdsymutil valgrind grep gas bugpoint_topts + global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir llvmdsymutil + global valgrind grep gas set path [file join $srcdir $subdir] # Substitute all Tcl variables. @@ -77,8 +77,6 @@ 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_topts with actual bugpoint target options - regsub -all {%bugpoint_topts} $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 |