AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix "elf: Add tst-ldconfig-ld_so_conf-update test" on 32bit.

Browse Source 
This new test was introduced with recent commit
591236f1a3.
If run on 32bit, it fails while renaming tst-ldconfig-ld-mod.so as there is no
/usr/lib64 directory. This patch is constructing the file name with help of
support_libdir_prefix.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Stefan Liebler 2020-01-13 11:06:41 +01:00
parent ae793cc20d
commit 3c8639b02e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elf/tst-ldconfig-ld_so_conf-update.c
View File

@ -71,9 +71,11 @@ do_test (void)
/* Rename the DSO to start with "lib" because there's an undocumented
filter in ldconfig where it ignores any file that doesn't start with
"lib" (for regular shared libraries) or "ld-" (for ld-linux-*). */
if (rename ("/usr/lib64/tst-ldconfig-ld-mod.so",
"/tmp/tst-ldconfig/libldconfig-ld-mod.so"))
char *mod_src_path = xasprintf ("%s/tst-ldconfig-ld-mod.so",
support_libdir_prefix);
if (rename (mod_src_path, "/tmp/tst-ldconfig/libldconfig-ld-mod.so"))
FAIL_EXIT1 ("Renaming/moving the DSO failed: %m");
free (mod_src_path);
/* Open the DSO. We expect this to fail - tst-ldconfig directory