niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

elf: Take into account ${sysconfdir} in elf/tst-ldconfig-p.sh

Browse source 
Take into account ${sysconfdir} in elf/tst-ldconfig-p.sh.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Romain Geissler 2023-03-26 19:25:58 +00:00 • committed by Adhemerval Zanella
parent 4b4b62191e
commit bb557fff2e
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
elf/Makefile
View file

@ -2405,7 +2405,7 @@ $(objpfx)tst-ldconfig-X.out : tst-ldconfig-X.sh $(objpfx)ldconfig
$(evaluate-test) $(evaluate-test)
$(objpfx)tst-ldconfig-p.out : tst-ldconfig-p.sh $(objpfx)ldconfig $(objpfx)tst-ldconfig-p.out : tst-ldconfig-p.sh $(objpfx)ldconfig
$(SHELL) $< '$(common-objpfx)' '$(test-wrapper-env)' \ $(SHELL) $< '$(common-objpfx)' '$(sysconfdir)' '$(test-wrapper-env)' \
'$(run-program-env)' > $@; \ '$(run-program-env)' > $@; \
$(evaluate-test) $(evaluate-test)

11
elf/tst-ldconfig-p.sh
View file

@ -23,11 +23,12 @@
# involves emulation when running ldconfig). # involves emulation when running ldconfig).
common_objpfx=$1 common_objpfx=$1
test_wrapper_env=$2 sysconfdir=$2
run_program_env=$3 test_wrapper_env=$3
run_program_env=$4
if ! test -r /etc/ld.so.cache; then if ! test -r "${sysconfdir}/ld.so.cache"; then
echo "warning: /etc/ld.so.cache does not exist, test skipped" echo "warning: ${sysconfdir}/ld.so.cache does not exist, test skipped"
exit 77 exit 77
fi fi
@ -46,7 +47,7 @@ errors=0
case $status in case $status in
(0) (0)
if head -n 1 "$testout" | \ if head -n 1 "$testout" | \
grep -q "libs found in cache \`/etc/ld.so.cache'\$" ; then grep -q "libs found in cache \`${sysconfdir}/ld.so.cache'\$" ; then
echo "info: initial string found" >>"$testout" echo "info: initial string found" >>"$testout"
else else
echo "error: initial string not found" >>"$testout" echo "error: initial string not found" >>"$testout"