From e40a0d2113bfeb5018409ed25e9711e6da7d994b Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 19 Oct 2012 23:30:43 +0000
Subject: Use $(run-program-prefix) in more shell script tests.

---
 malloc/Makefile      | 2 +-
 malloc/tst-mtrace.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'malloc')

diff --git a/malloc/Makefile b/malloc/Makefile
index eb909fd..9dd0336 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -109,7 +109,7 @@ ifeq (yes,$(build-shared))
 ifneq ($(PERL),no)
 tests: $(objpfx)tst-mtrace.out
 $(objpfx)tst-mtrace.out: tst-mtrace.sh $(objpfx)tst-mtrace
-	$(SHELL) $< $(common-objpfx)
+	$(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
 endif
 endif
 endif
diff --git a/malloc/tst-mtrace.sh b/malloc/tst-mtrace.sh
index 14b0ad4..d81e550 100755
--- a/malloc/tst-mtrace.sh
+++ b/malloc/tst-mtrace.sh
@@ -20,13 +20,14 @@
 set -e
 
 common_objpfx=$1; shift
+run_program_prefix=$1; shift
 
 status=0
 trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
 
 MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \
 LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${run_program_prefix} \
   ${common_objpfx}malloc/tst-mtrace || status=1
 
 if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-- 
cgit v1.1