qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Joseph Myers 2012-10-19 20:00:43 +00:00
parent 3c97f6525f
commit 135948bd50
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -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> 2012-10-19 Jim Blandy <jimb@codesourcery.com>
Joseph Myers <joseph@codesourcery.com> Joseph Myers <joseph@codesourcery.com>

2
posix/Makefile
View File

@ -277,7 +277,7 @@ $(objpfx)tst-boost-mem: $(objpfx)tst-boost.out
$(common-objpfx)malloc/mtrace $(objpfx)tst-boost.mtrace > $@ $(common-objpfx)malloc/mtrace $(objpfx)tst-boost.mtrace > $@
$(objpfx)tst-getconf.out: tst-getconf.sh $(objpfx)getconf $(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)) ifeq (yes,$(build-shared))
$(objpfx)tst-regex: $(common-objpfx)rt/librt.so $(objpfx)tst-regex: $(common-objpfx)rt/librt.so

17
posix/tst-getconf.sh
View File

@ -20,18 +20,7 @@
set -e set -e
common_objpfx=$1; shift common_objpfx=$1; shift
elf_objpfx=$1; shift run_getconf=$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
logfile=$common_objpfx/posix/tst-getconf.out logfile=$common_objpfx/posix/tst-getconf.out
@ -45,7 +34,7 @@ rm -f $logfile
result=0 result=0
while read name; do while read name; do
echo -n "getconf $name: " >> $logfile 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 if test $? -ne 0; then
echo "*** $name FAILED" >> $logfile echo "*** $name FAILED" >> $logfile
result=1 result=1
@ -223,7 +212,7 @@ EOF
while read name; do while read name; do
echo -n "getconf $name /: " >> $logfile 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 if test $? -ne 0; then
echo "*** $name FAILED" >> $logfile echo "*** $name FAILED" >> $logfile
result=1 result=1