Use $(built-program-cmd) in posix/tst-getconf.sh

["Joseph S. Myers" <joseph at codesourcery dot com>]

The test script posix/tst-getconf.sh constructs a command to run the
dynamic linker, in order to run the getconf binary.

Various other tests pass $(built-program-cmd) - the full command for
running a binary built with the new glibc - to test scripts.  This
patch arranges for the path to getconf to be passed this way, so that
this script doesn't need to know details about the dynamic linker and
doesn't need for cross testing to know directly about the cross-test
wrapper.

Tested x86_64.

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.

diff --git a/posix/Makefile b/posix/Makefile
index 182c120..153f446 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 030926a..b602f3e 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

-- 
Joseph S. Myers
joseph@codesourcery.com