about summary refs log tree commit diff
path: root/nptl/tst-cancelx8.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-04-30 16:11:57 -0300
committerH.J. Lu <hjl.tools@gmail.com>2024-05-10 07:50:59 -0700
commit3c15600e794570a02909987303e975d11bdd301b (patch)
tree3ac762468839897a171c7232a4e130ff1aafa3da /nptl/tst-cancelx8.c
parent6fc6b074ea78adc35e2e2df71e6cea1f4d35c9f0 (diff)
downloadglibc-3c15600e794570a02909987303e975d11bdd301b.tar.gz
glibc-3c15600e794570a02909987303e975d11bdd301b.tar.xz
glibc-3c15600e794570a02909987303e975d11bdd301b.zip
elf: Fix elf/tst-pldd with --enable-hardcoded-path-in-tests (BZ#24506)
The elf/tst-pldd (added by 1a4c27355e146 to fix BZ#18035) test does
not expect the hardcoded paths that are output by pldd when the test
is built with --enable-hardcoded-path-in-tests.  Instead of showing
the ABI installed library names for loader and libc (such as
ld-linux-x86-64.so.2 and libc.so.6 for x86_64), pldd shows the default
built ld.so and libc.so.

It makes the tests fail with an invalid expected loader/libc name.

This patch fixes the elf-pldd test by adding the canonical ld.so and
libc.so names in the expected list of possible outputs when parsing
the result output from pldd.  The test now handles both default
build and --enable-hardcoded-path-in-tests option.

Checked on x86_64-linux-gnu (built with and without
--enable-hardcoded-path-in-tests) and i686-linux-gnu.

	* elf/tst-pldd.c (in_str_list): New function.
	(do_test): Add default names for ld and libc as one option.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
(cherry picked from commit b2af6fb2ed23930c148bae382ca85fad4d1cf32e)
Diffstat (limited to 'nptl/tst-cancelx8.c')
0 files changed, 0 insertions, 0 deletions