[ltrace-commits] 03/03: Fix XDG_CONFIG_DIRS.exp failing when ltrace needs LD_LIBRARY_PATH to run

[Petr Machata]

This is an automated email from the git hooks/post-receive script.

pmachata-guest pushed a commit to branch master
in repository ltrace.

commit 9ac7f0b0a7e6a72e4a8715b534cb3ce49b12b7a5
Author: Роман Донченко <dpb at corrigendum.ru>
Date:   Sun Apr 5 22:51:18 2015 +0300

    Fix XDG_CONFIG_DIRS.exp failing when ltrace needs LD_LIBRARY_PATH to run
---
 testsuite/lib/ltrace.exp                  | 2 +-
 testsuite/ltrace.main/XDG_CONFIG_DIRS.exp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testsuite/lib/ltrace.exp b/testsuite/lib/ltrace.exp
index 709780e..24a2b43 100644
--- a/testsuite/lib/ltrace.exp
+++ b/testsuite/lib/ltrace.exp
@@ -765,7 +765,7 @@ proc ld_library_path { args } {
 	if {[string length $libunwind_LD_LIBRARY_PATH] > 0} {
 		lappend ALL_LIBRARY_PATHS $libunwind_LD_LIBRARY_PATH
 	}
-	lappend ALL_LIBRARY_PATHS $args
+	lappend ALL_LIBRARY_PATHS {*}$args
 	join $ALL_LIBRARY_PATHS ":"
 }
 
diff --git a/testsuite/ltrace.main/XDG_CONFIG_DIRS.exp b/testsuite/ltrace.main/XDG_CONFIG_DIRS.exp
index fea2445..7b2786b 100644
--- a/testsuite/ltrace.main/XDG_CONFIG_DIRS.exp
+++ b/testsuite/ltrace.main/XDG_CONFIG_DIRS.exp
@@ -24,7 +24,7 @@ setenv XDG_CONFIG_DIRS "blah"
 ltraceRun -L -- $bin
 unsetenv XDG_CONFIG_DIRS
 
-if {[catch "exec $LTRACE -L -F blah -- $bin" output]} {
+if {[catch {exec env LD_LIBRARY_PATH=[ld_library_path] $LTRACE -L -F blah -- $bin} output]} {
     ltraceMatch [ltraceSource ltrace "$output"] {
 	{blah == 1}
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/ltrace.git