public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] elf: Take into account ${sysconfdir} in elf/tst-ldconfig-p.sh Date: Mon, 27 Mar 2023 20:17:27 +0000 (GMT) [thread overview] Message-ID: <20230327201727.0C57A38582AC@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=bb557fff2ec20e0926932684f69835f90626bb06 commit bb557fff2ec20e0926932684f69835f90626bb06 Author: Romain Geissler <romain.geissler@gmail.com> Date: Sun Mar 26 19:25:58 2023 +0000 elf: Take into account ${sysconfdir} in elf/tst-ldconfig-p.sh Take into account ${sysconfdir} in elf/tst-ldconfig-p.sh. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> Diff: --- elf/Makefile | 2 +- elf/tst-ldconfig-p.sh | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index a32618a01f..8cf46ba782 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -2405,7 +2405,7 @@ $(objpfx)tst-ldconfig-X.out : tst-ldconfig-X.sh $(objpfx)ldconfig $(evaluate-test) $(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)' > $@; \ $(evaluate-test) diff --git a/elf/tst-ldconfig-p.sh b/elf/tst-ldconfig-p.sh index ec937bf4ec..e966c4d124 100644 --- a/elf/tst-ldconfig-p.sh +++ b/elf/tst-ldconfig-p.sh @@ -23,11 +23,12 @@ # involves emulation when running ldconfig). common_objpfx=$1 -test_wrapper_env=$2 -run_program_env=$3 +sysconfdir=$2 +test_wrapper_env=$3 +run_program_env=$4 -if ! test -r /etc/ld.so.cache; then - echo "warning: /etc/ld.so.cache does not exist, test skipped" +if ! test -r "${sysconfdir}/ld.so.cache"; then + echo "warning: ${sysconfdir}/ld.so.cache does not exist, test skipped" exit 77 fi @@ -46,7 +47,7 @@ errors=0 case $status in (0) 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" else echo "error: initial string not found" >>"$testout"
reply other threads:[~2023-03-27 20:17 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230327201727.0C57A38582AC@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).