From 5cb798252fd5d95e19e1ac212333d07606699b5e Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Tue, 25 Jul 2000 10:06:51 +0000
Subject: * stdio-common/Makefile ($(objpfx)tst-unbputc.out): Change parameter

according to changes in test program, run also with static only
builds.
($(objpfx)tst-printf.out): Likewise.
	* stdio-common/tst-unbputc.sh: Likewise.
	* stdio-common/tst-printf.sh: Likewise.
---
 stdio-common/Makefile       | 8 +++-----
 stdio-common/tst-printf.sh  | 3 ++-
 stdio-common/tst-unbputc.sh | 3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index cef34f42f8..62289fef91 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -28,7 +28,7 @@ routines	:=							      \
 	_itoa _itowa _i18n_itoa _i18n_itowa itoa-digits itowa-digits	      \
 	vfprintf vprintf printf_fp reg-printf printf-prs printf_fphex	      \
 	printf_size fprintf printf snprintf sprintf asprintf dprintf	      \
-	vfscanf 							      \
+	vfscanf							      \
 	fscanf scanf sscanf						      \
 	perror psignal							      \
 	tmpfile tmpfile64 tmpnam tmpnam_r tempnam tempname		      \
@@ -60,18 +60,16 @@ test-srcs = tst-unbputc tst-printf
 
 include ../Rules
 
-ifeq (yes,$(build-shared))
 .PHONY: do-tst-unbputc do-tst-printf
 tests: do-tst-unbputc do-tst-printf
 
 do-tst-unbputc: $(objpfx)tst-unbputc.out
 $(objpfx)tst-unbputc.out: $(objpfx)tst-unbputc tst-unbputc.sh
-	$(SHELL) -e tst-unbputc.sh $(common-objpfx)
+	$(SHELL) -e tst-unbputc.sh $(common-objpfx) '$(run-program-prefix)'
 
 do-tst-printf: $(objpfx)tst-printf.out
 $(objpfx)tst-printf.out: $(objpfx)tst-printf tst-printf.sh
-	$(SHELL) -e tst-printf.sh $(common-objpfx)
-endif
+	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
 
 CFLAGS-vfprintf.c = -Wno-uninitialized
 CFLAGS-tst-printf.c = -Wno-format
diff --git a/stdio-common/tst-printf.sh b/stdio-common/tst-printf.sh
index 7023cfc733..dbf15d436c 100644
--- a/stdio-common/tst-printf.sh
+++ b/stdio-common/tst-printf.sh
@@ -19,11 +19,12 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 common_objpfx=$1; shift
+run_program_prefix=$1; shift
 
 status=0
 
 LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${run_program_prefix} \
   ${common_objpfx}stdio-common/tst-printf \
   > ${common_objpfx}stdio-common/tst-printf.out || status=1
 
diff --git a/stdio-common/tst-unbputc.sh b/stdio-common/tst-unbputc.sh
index efc07778e3..89e02596c1 100755
--- a/stdio-common/tst-unbputc.sh
+++ b/stdio-common/tst-unbputc.sh
@@ -19,10 +19,11 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 common_objpfx=$1; shift
+run_program_prefix=$1; shift
 
 status=0
 
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${run_program_prefix} \
   ${common_objpfx}stdio-common/tst-unbputc \
     2> ${common_objpfx}stdio-common/tst-unbputc.out || status=1
 
-- 
cgit 1.4.1