Allow setting an arbitary value for blddirffi in testsuite
authorYuriy Kolerov <yuriy.kolerov@synopsys.com>
Thu, 28 Jul 2016 17:57:09 +0000 (20:57 +0300)
committerYuriy Kolerov <yuriy.kolerov@synopsys.com>
Thu, 28 Jul 2016 18:34:06 +0000 (21:34 +0300)
It is useful when tests are executed not from build directory. So
the path of the build directory may be passed through site.exp or
runtest.

Signed-off-by: Yuriy Kolerov <yuriy.kolerov@synopsys.com>
testsuite/lib/libffi.exp

index de91e3b..6e5f7a4 100644 (file)
@@ -102,11 +102,14 @@ proc libffi-init { args } {
     global ld_library_path
     global compiler_vendor
 
-    set blddirffi [pwd]/.. 
+    if ![info exists blddirffi] {
+       set blddirffi [pwd]/..
+    }
+
     verbose "libffi $blddirffi"
 
     # Which compiler are we building with?
-    set tmp [grep ../config.log "^ax_cv_c_compiler_vendor.*$"]
+    set tmp [grep "$blddirffi/config.log" "^ax_cv_c_compiler_vendor.*$"]
     regexp -- {^[^=]*=(.*)$} $tmp nil compiler_vendor
 
     if { [string match $compiler_vendor "gnu"] } {