From: Romain Geissler <romain.geissler@gmail.com>
To: libc-alpha@sourceware.org
Cc: romain.geissler@amadeus.com
Subject: [PATCH 3/3] Fix tst-glibc-hwcaps-prepend-cache with custom configure prefix value
Date: Sun, 26 Mar 2023 20:00:16 +0000 [thread overview]
Message-ID: <20230326200016.219-4-romain.geissler@amadeus.com> (raw)
In-Reply-To: <20230326200016.219-1-romain.geissler@amadeus.com>
---
elf/tst-glibc-hwcaps-prepend-cache.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/elf/tst-glibc-hwcaps-prepend-cache.c b/elf/tst-glibc-hwcaps-prepend-cache.c
index 2a448423495..fe074b28028 100644
--- a/elf/tst-glibc-hwcaps-prepend-cache.c
+++ b/elf/tst-glibc-hwcaps-prepend-cache.c
@@ -44,9 +44,13 @@ do_test (void)
if (dlopen (SONAME, RTLD_NOW) != NULL)
FAIL_EXIT1 (SONAME " is already on the search path");
- /* Install the default implementation of libmarkermod1.so. */
- xmkdirp ("/etc", 0777);
- support_write_file_string ("/etc/ld.so.conf", "/glibc-test/lib\n");
+ {
+ /* Install the default implementation of libmarkermod1.so. */
+ char *conf_path = xasprintf ("%s/ld.so.conf", support_sysconfdir_prefix);
+ xmkdirp (support_sysconfdir_prefix, 0777);
+ support_write_file_string (conf_path, "/glibc-test/lib\n");
+ free (conf_path);
+ }
xmkdirp ("/glibc-test/lib/glibc-hwcaps/prepend2", 0777);
xmkdirp ("/glibc-test/lib/glibc-hwcaps/prepend3", 0777);
{
--
2.31.1
next prev parent reply other threads:[~2023-03-26 20:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-26 20:00 [PATCH 0/3] Fix tst-ldconfig-ld_so_conf-update and " Romain Geissler
2023-03-26 20:00 ` [PATCH 1/3] support: introduce support_sysconfdir_prefix Romain Geissler
2023-03-27 17:24 ` Adhemerval Zanella Netto
2023-03-26 20:00 ` [PATCH 2/3] Fix tst-ldconfig-ld_so_conf-update with custom configure prefix value Romain Geissler
2023-03-27 17:24 ` Adhemerval Zanella Netto
2023-03-26 20:00 ` Romain Geissler [this message]
2023-03-27 17:24 ` [PATCH 3/3] Fix tst-glibc-hwcaps-prepend-cache " Adhemerval Zanella Netto
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=20230326200016.219-4-romain.geissler@amadeus.com \
--to=romain.geissler@gmail.com \
--cc=libc-alpha@sourceware.org \
--cc=romain.geissler@amadeus.com \
/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: link
Be 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).