[llvm-commits] CVS: llvm/test/lib/llvm2cpp.exp

[Reid Spencer]

Changes in directory llvm/test/lib:

llvm2cpp.exp updated: 1.1 -> 1.2
---
Log message:

Fix a problem where dejagnu won't accept the value of global tcl variable
"libdir" for some reason. Changing to llvmlibsdir instead fixes it.


---
Diffs of the changes:  (+5 -6)

 llvm2cpp.exp |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)


Index: llvm/test/lib/llvm2cpp.exp
diff -u llvm/test/lib/llvm2cpp.exp:1.1 llvm/test/lib/llvm2cpp.exp:1.2
--- llvm/test/lib/llvm2cpp.exp:1.1	Sat May 27 23:21:40 2006
+++ llvm/test/lib/llvm2cpp.exp	Sun May 28 02:22:42 2006
@@ -7,12 +7,12 @@
 
 proc llvm2cpp-test { files } {
 #  if { $env(LLVM_RUNLLVM2CPP_TEST) == 1 } {
-    global subdir tooldir libdir objdir srcdir objroot srcroot 
+    global subdir llvmtoolsdir llvmlibsdir objdir srcdir objroot srcroot 
     set timeout 30
     set path [file join $objdir $subdir]
-    set llvm2cpp [file join $tooldir llvm2cpp ]
-    set llvmas [file join $tooldir llvm-as ]
-    set llvmdis [file join $tooldir llvm-dis ]
+    set llvm2cpp [file join $llvmtoolsdir llvm2cpp ]
+    set llvmas [file join $llvmtoolsdir llvm-as ]
+    set llvmdis [file join $llvmtoolsdir llvm-dis ]
 
     #Make Output Directory if it does not exist already
     if { [file exists path] } {
@@ -49,8 +49,7 @@
       }
 
       set retval [ catch { 
-        exec -keepnewline gcc -g -D__STDC_LIMIT_MACROS -o $executable $generated -I$srcroot/include -I$objroot/include -L$libdir $libdir/LLVMCore.o -lLLVMSupport $libdir/LLVMbzip2.o -lLLVMSystem -lstdc++ } msg ]
-
+        exec -keepnewline gcc -g -D__STDC_LIMIT_MACROS -o $executable $generated -I$srcroot/include -I$objroot/include -L$llvmlibsdir $llvmlibsdir/LLVMCore.o -lLLVMSupport $llvmlibsdir/LLVMbzip2.o -lLLVMSystem -lstdc++ } msg ] 
       if { $retval != 0 } {
         fail "$test: gcc returned $retval\n$msg"
         continue