+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>
$(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
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
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
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