From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oo1-xc34.google.com (mail-oo1-xc34.google.com [IPv6:2607:f8b0:4864:20::c34]) by sourceware.org (Postfix) with ESMTPS id 9465C3858C2F for ; Mon, 27 Mar 2023 17:24:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9465C3858C2F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oo1-xc34.google.com with SMTP id i4-20020a056820138400b0053e3ccf739cso559365oow.10 for ; Mon, 27 Mar 2023 10:24:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679937892; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=pjfw/5jou0HSxl5TlDiiv8Xw1GK+4gGfJLNIXIdUOhU=; b=U+PH938Pwirqwu91D2VXRDfRrzkJ6QpO4/PFUwud8ngZkKKv0dQP8ktI4RKG3WE7vU xbQ/tuGzlkIvHh1ljcaGbR7DvS7XoytItYvBstbKjiOCNyY7YwvmXjB9O3NyFdku6bXv h7KeUXXWd7hZFMitlIeiWxloFK0TRNQg6aqvPH8BO0PMbr1yals5ag+hqHDax+xGSaPn UgUrnKMFh+XsvTtY/Hat918A2IPMSrO0RhNlU3JuqobpkuG3XNGmYSx/1Q7DmKMp/V7r fnk10ww7VYsLNn09gylsao49VbgGHdZZugGPDuGy8kW1mt3+XvyF+/5BkRRVMH0zZa6Y uPCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679937892; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pjfw/5jou0HSxl5TlDiiv8Xw1GK+4gGfJLNIXIdUOhU=; b=XkySrR0xDbKdPjxCJNm9veXcjxhRLl0aahtr4AUzIV+bWakGxlHZ98wASQzJcgiYP2 giH6pyLTRJEg12sC2aUDl7ffjy2KnaURor9WIMtYhKcxGuRlxqqf962V+rAf1149X2SO LLPVe5HDFkKRp3yZHRCVJGDEP74mx7Md367+w2hQN05e08AG1gCOgaQNG5af4vFr0s1x yrb3xGMWDk8Wnit8jdGC/zKlB7FKVg9ic8b3xMcCSvHOb2YnonMPqmvmljrtDyXl2aGp Vq5VXkkb1NAUWHusWQMGhWos16r9QPIhWVwtZEIdiNb1xy5NG4MYPtcdfRp4QvSsJBVQ uUOQ== X-Gm-Message-State: AO0yUKUwre8nRpy6WZrbMqF/SZtJF5FbQd+9+vSABEpJgcBqoD3BtjYE j5mjiNye9wK4Q32dItC3CaBIeTOppAXnOp6WFi3dTg== X-Google-Smtp-Source: AK7set/0RLnbaXLy60NSgIFhkX0K13oof1+q1mIYCvoe5c81ybQi5fqLrKHwYSr4rUeDIiSHtj4NXQ== X-Received: by 2002:a4a:d64a:0:b0:53b:6b36:2a9a with SMTP id y10-20020a4ad64a000000b0053b6b362a9amr6452484oos.8.1679937891846; Mon, 27 Mar 2023 10:24:51 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c1:60f9:9d7f:7b90:a6ae:401d? ([2804:1b3:a7c1:60f9:9d7f:7b90:a6ae:401d]) by smtp.gmail.com with ESMTPSA id 4-20020a4a1704000000b00524faf3d2d7sm11649255ooe.41.2023.03.27.10.24.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Mar 2023 10:24:51 -0700 (PDT) Message-ID: <183e9086-ccb6-6e08-cd8f-5489ca224c33@linaro.org> Date: Mon, 27 Mar 2023 14:24:48 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [PATCH v2] Take into account ${sysconfdir} in elf/tst-ldconfig-p.sh. Content-Language: en-US To: Romain Geissler , libc-alpha@sourceware.org Cc: romain.geissler@amadeus.com References: <20230326192558.64-1-romain.geissler@amadeus.com> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20230326192558.64-1-romain.geissler@amadeus.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 26/03/23 16:25, Romain Geissler wrote: > Hi, > > This is a follow up of https://sourceware.org/pipermail/libc-alpha/2023-March/146331.html > this sent by git send-mail, so hopefully the patch applies fine. > > Cheers, > Romain > > > Take into account ${sysconfdir} in elf/tst-ldconfig-p.sh. LGTM, thanks. Reviewed-by: Adhemerval Zanella > > --- > 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 4d0e04b2a20..262fbd1770c 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -2421,7 +2421,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 ec937bf4ec0..e966c4d1241 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"