From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id C9E1F3850854; Mon, 27 Mar 2023 20:17:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C9E1F3850854 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679948236; bh=Tgbxz0ADMFUytZaO+eJQ7gfaMKLyaXw/Z919fBvBjA8=; h=From:To:Subject:Date:From; b=WTm3LlUhwNYGaJlBFGqM19ijZKAlaaQVx0SNqdgg+3H55VFDKOmVr/7df2sTnP1tp XX5b4On6rmw4Dt39YdiOwEPpDszDqM8aNy5mM8cG8IbY4qcNhBtW4dpXdxRN5P1P9K Svx/qwUMJt+TdaEhIsDyxcUy/6Ye8u8r5Lfcit1Y= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] Fix tst-ldconfig-ld_so_conf-update with custom configure prefix value X-Act-Checkin: glibc X-Git-Author: Romain Geissler X-Git-Refname: refs/heads/master X-Git-Oldrev: 57ce87a940071a152a27e1e1be1dc9eced55ca6c X-Git-Newrev: cce422a63262dad5e6d7108d36092fc0757b5594 Message-Id: <20230327201716.C9E1F3850854@sourceware.org> Date: Mon, 27 Mar 2023 20:17:16 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cce422a63262dad5e6d7108d36092fc0757b5594 commit cce422a63262dad5e6d7108d36092fc0757b5594 Author: Romain Geissler Date: Sun Mar 26 20:00:15 2023 +0000 Fix tst-ldconfig-ld_so_conf-update with custom configure prefix value Reviewed-by: Adhemerval Zanella Diff: --- 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 503afb3211..2c5c48615d 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; }