From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by sourceware.org (Postfix) with ESMTPS id AEFB1385842C for ; Mon, 27 Mar 2023 17:24:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AEFB1385842C 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-oi1-x22d.google.com with SMTP id bm2so6924670oib.4 for ; Mon, 27 Mar 2023 10:24:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679937862; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=0tJJ6CMWg+l9Kg+oYLZhgLUQJRAlMCOnguW+vKWHCr4=; b=NUHdDTNRYHsK8Y7Nhl4/4EPO57nylU54+T2V3Q8TmsM/jewQxna4r1dV3f7fTqTYj3 cmR/sAcNRZxrbYq4E+2qxnNaeBTTONlXKKtCRuvDY7L24n0mfUZCbNrXCc+dASIHavqO cyhusYqLNi2v4c8FdqRX7INfLzEra46EM64gD5K5cNfXcWqiZ3jUxitZjYtave4oUuhV ZuKFnbIHGrTc+I+rF0WoqSJVK1eexyYkJPF8947G4QVc8FrCXd2w7vHwkzQaf64p6Pbk ZnzbI7aP8KScc/fmcdqQQnKEp9XXW3soZUongdPd6Bg5lesCAUFMGzEdGSolCfhEnjp0 D8/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679937862; h=content-transfer-encoding:in-reply-to:organization:from:references :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=0tJJ6CMWg+l9Kg+oYLZhgLUQJRAlMCOnguW+vKWHCr4=; b=jDBTKrIquh8od9cQqM/Z+GMD3L3JKMni77RraWEMErXd3k3aKEKtCCOnDXEpmZTe9q GI/J27Yxm5CIcLO4C8rPIquryYCapNRHqm/umyqGO6evH8KfjwIOWLo8yvMeckws0YR8 QYbdoYwgF8Z6PUgktNgUy4sdrLQuPJID0m5RC5gvcxmGuzGMcceO3Yc0UDMKBO0L0qUK SQI09Ov0XbCoo2a/Z4FazCS2dT7iwOjogoTc46nDURkrFawNm2ierWambA2+30q3/bni DnQAzerv37l5H4ZNSL3xNRTL//bLYJZoVfHVKm1ekX5JzgoMA+GG1sq6b7DZnxROzfdq Ibcg== X-Gm-Message-State: AO0yUKVrv2CnRb2acIzsqpvKXjEwM7cw4CepJkQ6Ad05gp//MaKfxAFf 4nImgF9F0al5vkuZw1V8BbNlyr9+S1nBDt8c2JMPBw== X-Google-Smtp-Source: AK7set80wgWHD/HY1rsOj8gs5iwBoNFA+mFemcK/y0fW27eys7uAjoPNKWU3Y7DSXEgPn0Fy43QTNg== X-Received: by 2002:a05:6808:192:b0:387:775c:c706 with SMTP id w18-20020a056808019200b00387775cc706mr5220471oic.42.1679937862266; Mon, 27 Mar 2023 10:24:22 -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 r66-20020acaf345000000b00386ea719ca7sm9926297oih.17.2023.03.27.10.24.21 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Mar 2023 10:24:21 -0700 (PDT) Message-ID: Date: Mon, 27 Mar 2023 14:24:19 -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 2/3] Fix tst-ldconfig-ld_so_conf-update with custom configure prefix value Content-Language: en-US To: libc-alpha@sourceware.org References: <20230326200016.219-1-romain.geissler@amadeus.com> <20230326200016.219-3-romain.geissler@amadeus.com> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20230326200016.219-3-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: LGTM, thanks. Reviewed-by: Adhemerval Zanella On 26/03/23 17:00, Romain Geissler via Libc-alpha wrote: > --- > elf/tst-ldconfig-ld_so_conf-update.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/elf/tst-ldconfig-ld_so_conf-update.c b/elf/tst-ldconfig-ld_so_conf-update.c > index 503afb3211e..2c5c48615d8 100644 > --- a/elf/tst-ldconfig-ld_so_conf-update.c > +++ b/elf/tst-ldconfig-ld_so_conf-update.c > @@ -33,7 +33,6 @@ > > #define DSO "libldconfig-ld-mod.so" > #define DSO_DIR "/tmp/tst-ldconfig" > -#define CONF "/etc/ld.so.conf" > > > static void > @@ -64,6 +63,8 @@ do_test (void) > { > struct support_capture_subprocess result; > > + char *conf_path = xasprintf ("%s/ld.so.conf", support_sysconfdir_prefix); > + > /* Create the needed directories. */ > xmkdirp ("/var/cache/ldconfig", 0777); > xmkdirp (DSO_DIR, 0777); > @@ -82,9 +83,9 @@ do_test (void) > is not searched. */ > TEST_VERIFY_EXIT (dlopen (DSO, RTLD_NOW | RTLD_GLOBAL) == NULL); > > - FILE *fp = xfopen (CONF, "a+"); > + FILE *fp = xfopen (conf_path, "a+"); > if (!fp) > - FAIL_EXIT1 ("creating /etc/ld.so.conf failed: %m"); > + FAIL_EXIT1 ("creating %s failed: %m", conf_path); > xfclose (fp); > > /* Run ldconfig. */ > @@ -95,9 +96,9 @@ do_test (void) > TEST_VERIFY_EXIT (dlopen (DSO, RTLD_NOW | RTLD_GLOBAL) == NULL); > > /* Add tst-ldconfig directory to /etc/ld.so.conf. */ > - fp = xfopen (CONF, "w"); > + fp = xfopen (conf_path, "w"); > if (!(fwrite (DSO_DIR, 1, sizeof (DSO_DIR), fp))) > - FAIL_EXIT1 ("updating /etc/ld.so.conf failed: %m"); > + FAIL_EXIT1 ("updating %s failed: %m", conf_path); > xfclose (fp); > > /* Try to dlopen the same DSO again, we expect this to still fail. */ > @@ -111,6 +112,8 @@ do_test (void) > /* Finally, we expect dlopen to pass now. */ > TEST_VERIFY_EXIT (dlopen (DSO, RTLD_NOW | RTLD_GLOBAL) != NULL); > > + free (conf_path); > + > return 0; > } >