diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | posix/Makefile | 2 | ||||
| -rw-r--r-- | posix/tst-getconf.sh | 17 |
3 files changed, 14 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index ebfd5062d3..be21718f9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-10-19 Joseph Myers <joseph@codesourcery.com> + + * posix/Makefile ($(objpfx)tst-getconf.out): Pass + $(built-program-cmd) to tst-getconf.sh, not $(elf-objpfx) and + $(rtld-installed-name). + * posix/tst-getconf.sh (elf_objpfx): Remove variable. + (rtld_installed_name): Likwise. + (runit): Remove function. + (run_getconf): New variable, Use it for running getconf binary. + 2012-10-19 Jim Blandy <jimb@codesourcery.com> Joseph Myers <joseph@codesourcery.com> diff --git a/posix/Makefile b/posix/Makefile index 182c1208dc..153f446576 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -277,7 +277,7 @@ $(objpfx)tst-boost-mem: $(objpfx)tst-boost.out $(common-objpfx)malloc/mtrace $(objpfx)tst-boost.mtrace > $@ $(objpfx)tst-getconf.out: tst-getconf.sh $(objpfx)getconf - $(SHELL) $< $(common-objpfx) $(elf-objpfx) $(rtld-installed-name) + $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' ifeq (yes,$(build-shared)) $(objpfx)tst-regex: $(common-objpfx)rt/librt.so diff --git a/posix/tst-getconf.sh b/posix/tst-getconf.sh index 030926a74f..b602f3e92b 100644 --- a/posix/tst-getconf.sh +++ b/posix/tst-getconf.sh @@ -20,18 +20,7 @@ set -e common_objpfx=$1; shift -elf_objpfx=$1; shift -if [ $# -eq 0 ]; then - # Static case. - runit() { - "$@" - } -else - rtld_installed_name=$1; shift - runit() { - ${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} "$@" - } -fi +run_getconf=$1; shift logfile=$common_objpfx/posix/tst-getconf.out @@ -45,7 +34,7 @@ rm -f $logfile result=0 while read name; do echo -n "getconf $name: " >> $logfile - runit ${common_objpfx}posix/getconf "$name" 2>> $logfile >> $logfile + ${run_getconf} "$name" 2>> $logfile >> $logfile if test $? -ne 0; then echo "*** $name FAILED" >> $logfile result=1 @@ -223,7 +212,7 @@ EOF while read name; do echo -n "getconf $name /: " >> $logfile - runit ${common_objpfx}posix/getconf "$name" / 2>> $logfile >> $logfile + ${run_getconf} "$name" / 2>> $logfile >> $logfile if test $? -ne 0; then echo "*** $name FAILED" >> $logfile result=1 |