From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 25 Jul 2026 16:11:44 +0000 (+0800)
Subject: elf: test: handle different rootsbindir in tst-ldconfig-cache
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02ea17b5add83a205d8b204dce28f38fe0498ea3;p=thirdparty%2Fglibc.git

elf: test: handle different rootsbindir in tst-ldconfig-cache

When compiling a glibc for a merged-/usr distro people may set
rootsbindir=/usr/sbin.  But tst-ldconfig-cache has hard-coded
/sbin/ldconfig path and so it fails with a different rootsbindir.

Fix it by using support_install_rootsbindir like run_ldconfig in
test-container.c.

Signed-off-by: Xi Ruoyao <xry111@xry111.site>
Reviewed-by: Florian Weimer <fweimer@redhat.com>
---

diff --git a/elf/tst-ldconfig-cache.c b/elf/tst-ldconfig-cache.c
index 9f71418b3a..f4820a1822 100644
--- a/elf/tst-ldconfig-cache.c
+++ b/elf/tst-ldconfig-cache.c
@@ -85,7 +85,10 @@ corrupt (void)
 static void
 ldconfig (void)
 {
-  xsystem ("/sbin/ldconfig -X");
+  char *cmd = xasprintf("%s/ldconfig -X", support_install_rootsbindir);
+  xsystem (cmd);
+
+  free(cmd);
 }
 
 /* Change ld.so.conf to refer to the new directory, and generate a new