--- glibc-2.3.4/catgets/Makefile.run-test-program-prefix 2004-01-21 00:42:49.000000000 +0100 +++ glibc-2.3.4/catgets/Makefile 2004-12-28 14:48:20.299488128 +0100 @@ -61,15 +61,15 @@ tests: $(objpfx)de/libc.cat $(objpfx)tes $(objpfx)test1.cat: test1.msg $(objpfx)gencat LC_ALL=hr_HR.ISO-8859-2 LOCPATH=$(common-objpfx)localedata \ GCONV_PATH=$(common-objpfx)iconvdata \ - $(built-program-cmd) -H $(objpfx)test1.h $@ $< + $(built-test-program-cmd) -H $(objpfx)test1.h $@ $< $(objpfx)test2.cat: test2.msg $(objpfx)gencat LOCPATH=$(common-objpfx)localedata \ GCONV_PATH=$(common-objpfx)iconvdata \ - $(built-program-cmd) -H $(objpfx)test2.h $@ $< + $(built-test-program-cmd) -H $(objpfx)test2.h $@ $< $(objpfx)de/libc.cat: $(objpfx)de.msg $(objpfx)gencat $(make-target-directory) LC_ALL=de_DE.ISO-8859-1 LOCPATH=$(common-objpfx)localedata \ - GCONV_PATH=$(common-objpfx)iconvdata $(built-program-cmd) $@ $< + GCONV_PATH=$(common-objpfx)iconvdata $(built-test-program-cmd) $@ $< $(objpfx)tst-catgets.out: $(objpfx)de/libc.cat # Generate a non-simple input file. @@ -78,9 +78,9 @@ $(objpfx)de.msg: $(..)po/de.po $(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \ $(objpfx)sample.SJIS.cat - $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' + $(SHELL) -e $< $(common-objpfx) '$(built-test-program-cmd)' $(objpfx)sample.SJIS.cat: sample.SJIS $(objpfx)gencat GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ - $(built-program-cmd) -H $(objpfx)test-gencat.h < $(word 1,$^) > $@ + $(built-test-program-cmd) -H $(objpfx)test-gencat.h < $(word 1,$^) > $@ endif --- glibc-2.3.4/libio/Makefile.run-test-program-prefix 2004-12-28 14:05:32.000000000 +0100 +++ glibc-2.3.4/libio/Makefile 2004-12-28 14:48:20.300488473 +0100 @@ -173,7 +173,7 @@ tests: $(objpfx)test-freopen.out $(objpf endif $(objpfx)test-freopen.out: test-freopen.sh $(objpfx)test-freopen - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' \ + $(SHELL) -e $< $(common-objpfx) '$(run-test-program-prefix)' \ $(common-objpfx)libio/ $(objpfx)tst-fopenloc.check: $(objpfx)tst-fopenloc.out --- glibc-2.3.4/localedata/Makefile.run-test-program-prefix 2004-08-11 08:17:41.000000000 +0200 +++ glibc-2.3.4/localedata/Makefile 2004-12-28 14:48:20.301488817 +0100 @@ -157,45 +157,45 @@ tests: $(objpfx)sort-test.out $(objpfx)t $(objpfx)sort-test.out: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \ $(test-input-data) $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(test-input) \ + $(SHELL) -e $< $(common-objpfx) '$(run-test-program-prefix)' $(test-input) \ > $@ $(objpfx)tst-fmon.out: tst-fmon.sh $(objpfx)tst-fmon tst-fmon.data \ $(objpfx)sort-test.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' tst-fmon.data \ + $(SHELL) -e $< $(common-objpfx) '$(run-test-program-prefix)' tst-fmon.data \ > $@ $(objpfx)tst-numeric.out: tst-numeric.sh $(objpfx)tst-numeric tst-numeric.data \ $(objpfx)sort-test.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' tst-numeric.data \ + $(SHELL) -e $< $(common-objpfx) '$(run-test-program-prefix)' tst-numeric.data \ > $@ $(objpfx)tst-locale.out: tst-locale.sh $(common-objpfx)locale/localedef \ $(ld-test-srcs) $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' > $@ + $(SHELL) -e $< $(common-objpfx) '$(built-test-program-cmd)' > $@ $(objpfx)tst-rpmatch.out: tst-rpmatch.sh $(objpfx)tst-rpmatch \ $(objpfx)tst-fmon.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' > $@ + $(SHELL) -e $< $(common-objpfx) '$(built-test-program-cmd)' > $@ $(objpfx)tst-trans.out: tst-trans.sh $(objpfx)tst-trans \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' + $(SHELL) -e $< $(common-objpfx) '$(run-test-program-prefix)' $(objpfx)tst-mbswcs.out: tst-mbswcs.sh $(objpfx)tst-mbswcs1 \ $(objpfx)tst-mbswcs2 $(objpfx)tst-mbswcs3 \ $(objpfx)tst-mbswcs4 $(objpfx)tst-mbswcs5 \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' + $(SHELL) -e $< $(common-objpfx) '$(run-test-program-prefix)' $(objpfx)tst-ctype.out: tst-ctype.sh $(objpfx)tst-ctype \ $(objpfx)sort-test.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' + $(SHELL) -e $< $(common-objpfx) '$(built-test-program-cmd)' $(objpfx)tst-wctype.out: tst-wctype.sh $(objpfx)tst-wctype \ $(objpfx)sort-test.out tst-wctype.input \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' + $(SHELL) -e $< $(common-objpfx) '$(built-test-program-cmd)' $(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \ $(objpfx)sort-test.out \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' + $(SHELL) -e $< $(common-objpfx) '$(built-test-program-cmd)' $(objpfx)tst-digits.out: $(objpfx)tst-locale.out $(objpfx)tst-mbswcs6.out: $(addprefix $(objpfx),$(CTYPE_FILES)) endif --- glibc-2.3.4/nptl/Makefile.run-test-program-prefix 2004-12-28 14:06:21.000000000 +0100 +++ glibc-2.3.4/nptl/Makefile 2004-12-28 14:48:20.302489162 +0100 @@ -411,7 +411,7 @@ CFLAGS-tst-oncex3.c += -fexceptions CFLAGS-tst-oncex4.c += -fexceptions CFLAGS-tst-align.c += $(stack-align-test-flags) -tst-cancel7-ARGS = --command "$(built-program-cmd)" +tst-cancel7-ARGS = --command "$(built-test-program-cmd)" tst-cancelx7-ARGS = $(tst-cancel7-ARGS) tst-umask1-ARGS = $(objpfx)tst-umask1.temp @@ -578,7 +578,7 @@ $(objpfx)tst-cancel-wrappers.out: tst-ca endif endif -tst-exec4-ARGS = $(built-program-cmd) +tst-exec4-ARGS = $(built-test-program-cmd) $(objpfx)tst-execstack: $(libdl) $(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so --- glibc-2.3.4/posix/Makefile.run-test-program-prefix 2004-12-28 14:06:47.000000000 +0100 +++ glibc-2.3.4/posix/Makefile 2004-12-28 14:48:20.303489507 +0100 @@ -153,8 +153,8 @@ CFLAGS-getconf.c = -DGETCONF_DIR='"$(lib tstgetopt-ARGS = -a -b -cfoobar --required foobar --optional=bazbug \ --none random --col --color --colour -tst-exec-ARGS = -- $(built-program-cmd) -tst-spawn-ARGS = -- $(built-program-cmd) +tst-exec-ARGS = -- $(built-test-program-cmd) +tst-spawn-ARGS = -- $(built-test-program-cmd) tst-dir-ARGS = `pwd` `cd $(common-objdir)/$(subdir); pwd` `cd $(common-objdir); pwd` $(objpfx)tst-dir tst-chmod-ARGS = `pwd` @@ -230,7 +230,7 @@ $(objpfx)bug-regex21-mem: $(objpfx)bug-r # time to process. $(objpfx)tst-rxspencer-mem: $(objpfx)tst-rxspencer.out MALLOC_TRACE=$(objpfx)tst-rxspencer.mtrace $(tst-rxspencer-ENV) \ - $(run-program-prefix) $(objpfx)tst-rxspencer rxspencer/tests \ + $(run-test-program-prefix) $(objpfx)tst-rxspencer rxspencer/tests \ > /dev/null $(common-objpfx)malloc/mtrace $(objpfx)tst-rxspencer.mtrace > $@ --- glibc-2.3.4/stdio-common/Makefile.run-test-program-prefix 2004-08-11 08:18:08.000000000 +0200 +++ glibc-2.3.4/stdio-common/Makefile 2004-12-28 14:48:20.304489851 +0100 @@ -68,11 +68,11 @@ 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) '$(run-program-prefix)' + $(SHELL) -e tst-unbputc.sh $(common-objpfx) '$(run-test-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) '$(run-program-prefix)' + $(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-test-program-prefix)' endif CFLAGS-vfprintf.c = -Wno-uninitialized --- glibc-2.3.4/string/Makefile.run-test-program-prefix 2004-10-29 11:52:30.000000000 +0200 +++ glibc-2.3.4/string/Makefile 2004-12-28 14:48:20.304489851 +0100 @@ -73,6 +73,6 @@ ifeq ($(cross-compiling),no) tests: $(objpfx)tst-svc.out $(objpfx)tst-svc.out: tst-svc.input $(objpfx)tst-svc GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ - $(built-program-cmd) < $(word 1,$^) > $@ + $(built-test-program-cmd) < $(word 1,$^) > $@ -cmp tst-svc.expect $(objpfx)tst-svc.out endif --- glibc-2.3.4/timezone/Makefile.run-test-program-prefix 2002-08-04 22:50:45.000000000 +0200 +++ glibc-2.3.4/timezone/Makefile 2004-12-28 14:48:20.305490196 +0100 @@ -177,7 +177,7 @@ CFLAGS-scheck.c = -Wno-strict-prototypes testdata = $(objpfx)testdata define build-testdata GCONV_PATH=${common-objpfx}iconvdata LANGUAGE=C LC_ALL=C \ - $(built-program-cmd) -d $(testdata) -y ./yearistype $< + $(built-test-program-cmd) -d $(testdata) -y ./yearistype $< endef $(objpfx)test-tz.out: $(addprefix $(testdata)/, America/New_York Etc/UTC UTC) --- glibc-2.3.4/Makeconfig.run-test-program-prefix 2004-12-28 14:48:20.293486060 +0100 +++ glibc-2.3.4/Makeconfig 2004-12-28 14:52:40.215608117 +0100 @@ -535,20 +535,24 @@ elf-objpfx = $(common-objpfx)elf/ # How to run a program we just linked with our library. # The program binary is assumed to be $(word 2,$^). built-program-file = $(dir $(word 2,$^))$(notdir $(word 2,$^)) -ifeq (yesyes,$(build-shared)$(elf)) comma = , sysdep-library-path = \ $(subst $(empty) ,:,$(strip $(patsubst -Wl$(comma)-rpath-link=%, %,\ $(filter -Wl$(comma)-rpath-link=%,\ $(sysdep-LDFLAGS))))) -run-program-prefix = $(if $(filter $(notdir $(built-program-file)),\ +run-test-program-prefix = $(if $(filter $(notdir $(built-program-file)),\ $(tests-static) $(xtests-static)),, \ $(elf-objpfx)$(rtld-installed-name) \ --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path))) +ifeq (yesyes,$(build-shared)$(elf)) +run-program-prefix = $(run-test-program-prefix) else run-program-prefix = endif # Never use $(run-program-prefix) for the statically-linked %-bp test programs +built-test-program-cmd = $(patsubst %,$(run-test-program-prefix),\ + $(filter-out %-bp,$(built-program-file))) \ + $(built-program-file) built-program-cmd = $(patsubst %,$(run-program-prefix),\ $(filter-out %-bp,$(built-program-file))) \ $(built-program-file) --- glibc-2.3.4/Makefile.run-test-program-prefix 2004-10-29 11:52:02.000000000 +0200 +++ glibc-2.3.4/Makefile 2004-12-28 14:48:20.307490885 +0100 @@ -142,7 +142,7 @@ $(common-objpfx)testrun.sh: $(common-obj $(..)Makeconfig $(..)Makefile (echo '#!/bin/sh'; \ echo "GCONV_PATH='$(common-objpfx)iconvdata' \\"; \ - echo 'exec $(run-program-prefix) $${1+"$$@"}'; \ + echo 'exec $(run-test-program-prefix) $${1+"$$@"}'; \ ) > $@T chmod a+x $@T mv -f $@T $@ --- glibc-2.3.4/Rules.run-test-program-prefix 2004-11-25 17:40:03.000000000 +0100 +++ glibc-2.3.4/Rules 2004-12-28 14:48:20.308491230 +0100 @@ -139,7 +139,7 @@ ifneq "$(strip $(tests) $(xtests) $(test # from the test programs and whatever input files are present. make-test-out = GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ - $($*-ENV) $(built-program-cmd) $($*-ARGS) + $($*-ENV) $(built-test-program-cmd) $($*-ARGS) $(objpfx)%-bp.out: %.input $(objpfx)%-bp $(make-test-out) > $@ < $(word 1,$^) $(objpfx)%.out: %.input $(objpfx)%