From: Kris Van Hees <kris.van.hees@oracle.com>
To: Sam James <sam@gentoo.org>
Cc: dtrace@lists.linux.dev
Subject: Re: [PATCH 5/6] test: libproc: cater to merged-usr systems
Date: Fri, 11 Oct 2024 23:30:50 -0400 [thread overview]
Message-ID: <ZwntandHaYD8a9Qr@oracle.com> (raw)
In-Reply-To: <db453ea9d3bad48b505c31c733c5460b6bfecdb7.1724962546.git.sam@gentoo.org>
On Thu, Aug 29, 2024 at 09:15:45PM +0100, Sam James wrote:
> On merged-usr systems (where /lib -> /usr/lib and so on), we get spurious
> failures like in tst.plddCreate.r:
> ```
> -: dyn {ptr}, bias {ptr}, LMID 0: symbol search path: (, /lib64/libc.so.6, /lib64/ld-linux-x86-64.so.2)
> -/lib64/libc.so.6: dyn {ptr}, bias {ptr}, LMID 0: inherited symbol search path: (, /lib64/libc.so.6, /lib64/ld-linux-x86-64.so.2)
> -/lib64/ld-linux-x86-64.so.2: dyn {ptr}, bias {ptr}, LMID 0: inherited symbol search path: (, /lib64/libc.so.6, /lib64/ld-linux-x86-64.so.2)
> +: dyn {ptr}, bias {ptr}, LMID 0: symbol search path: (, /usr/lib64/libc.so.6, /lib64/ld-linux-x86-64.so.2)
> +/usr/lib64/libc.so.6: dyn {ptr}, bias {ptr}, LMID 0: inherited symbol search path: (, /usr/lib64/libc.so.6, /lib64/ld-linux-x86-64.so.2)
> +/lib64/ld-linux-x86-64.so.2: dyn {ptr}, bias {ptr}, LMID 0: inherited symbol search path: (, /usr/lib64/libc.so.6, /lib64/ld-linux-x86-64.so.2)
> 3 libs seen.
> ```
>
> sed out the difference.
Reviewed-by: Kris Van Hees <kris.van.hees@oracle.com>
... and committed with Signed-off-by added.
> ---
> test/internals/libproc/tst.plddCreate.r.p | 3 +++
> test/internals/libproc/tst.plddCreate32.r.p | 3 +++
> test/internals/libproc/tst.plddCreatePIE.r.p | 3 +++
> test/internals/libproc/tst.plddCreatePIE32.r.p | 3 +++
> test/internals/libproc/tst.plddGrab.r.p | 3 +++
> test/internals/libproc/tst.plddGrab32.r.p | 3 +++
> test/internals/libproc/tst.plddGrabPIE.r.p | 3 +++
> test/internals/libproc/tst.plddGrabPIE32.r.p | 3 +++
> 8 files changed, 24 insertions(+)
> create mode 100755 test/internals/libproc/tst.plddCreate.r.p
> create mode 100755 test/internals/libproc/tst.plddCreate32.r.p
> create mode 100755 test/internals/libproc/tst.plddCreatePIE.r.p
> create mode 100755 test/internals/libproc/tst.plddCreatePIE32.r.p
> create mode 100755 test/internals/libproc/tst.plddGrab.r.p
> create mode 100755 test/internals/libproc/tst.plddGrab32.r.p
> create mode 100755 test/internals/libproc/tst.plddGrabPIE.r.p
> create mode 100755 test/internals/libproc/tst.plddGrabPIE32.r.p
>
> diff --git a/test/internals/libproc/tst.plddCreate.r.p b/test/internals/libproc/tst.plddCreate.r.p
> new file mode 100755
> index 00000000..51f27ca6
> --- /dev/null
> +++ b/test/internals/libproc/tst.plddCreate.r.p
> @@ -0,0 +1,3 @@
> +#!/bin/sed -f
> +# Handle merged-usr systems where /lib == /usr/lib.
> +s:/usr/lib:/lib:g
> diff --git a/test/internals/libproc/tst.plddCreate32.r.p b/test/internals/libproc/tst.plddCreate32.r.p
> new file mode 100755
> index 00000000..51f27ca6
> --- /dev/null
> +++ b/test/internals/libproc/tst.plddCreate32.r.p
> @@ -0,0 +1,3 @@
> +#!/bin/sed -f
> +# Handle merged-usr systems where /lib == /usr/lib.
> +s:/usr/lib:/lib:g
> diff --git a/test/internals/libproc/tst.plddCreatePIE.r.p b/test/internals/libproc/tst.plddCreatePIE.r.p
> new file mode 100755
> index 00000000..51f27ca6
> --- /dev/null
> +++ b/test/internals/libproc/tst.plddCreatePIE.r.p
> @@ -0,0 +1,3 @@
> +#!/bin/sed -f
> +# Handle merged-usr systems where /lib == /usr/lib.
> +s:/usr/lib:/lib:g
> diff --git a/test/internals/libproc/tst.plddCreatePIE32.r.p b/test/internals/libproc/tst.plddCreatePIE32.r.p
> new file mode 100755
> index 00000000..51f27ca6
> --- /dev/null
> +++ b/test/internals/libproc/tst.plddCreatePIE32.r.p
> @@ -0,0 +1,3 @@
> +#!/bin/sed -f
> +# Handle merged-usr systems where /lib == /usr/lib.
> +s:/usr/lib:/lib:g
> diff --git a/test/internals/libproc/tst.plddGrab.r.p b/test/internals/libproc/tst.plddGrab.r.p
> new file mode 100755
> index 00000000..51f27ca6
> --- /dev/null
> +++ b/test/internals/libproc/tst.plddGrab.r.p
> @@ -0,0 +1,3 @@
> +#!/bin/sed -f
> +# Handle merged-usr systems where /lib == /usr/lib.
> +s:/usr/lib:/lib:g
> diff --git a/test/internals/libproc/tst.plddGrab32.r.p b/test/internals/libproc/tst.plddGrab32.r.p
> new file mode 100755
> index 00000000..51f27ca6
> --- /dev/null
> +++ b/test/internals/libproc/tst.plddGrab32.r.p
> @@ -0,0 +1,3 @@
> +#!/bin/sed -f
> +# Handle merged-usr systems where /lib == /usr/lib.
> +s:/usr/lib:/lib:g
> diff --git a/test/internals/libproc/tst.plddGrabPIE.r.p b/test/internals/libproc/tst.plddGrabPIE.r.p
> new file mode 100755
> index 00000000..51f27ca6
> --- /dev/null
> +++ b/test/internals/libproc/tst.plddGrabPIE.r.p
> @@ -0,0 +1,3 @@
> +#!/bin/sed -f
> +# Handle merged-usr systems where /lib == /usr/lib.
> +s:/usr/lib:/lib:g
> diff --git a/test/internals/libproc/tst.plddGrabPIE32.r.p b/test/internals/libproc/tst.plddGrabPIE32.r.p
> new file mode 100755
> index 00000000..51f27ca6
> --- /dev/null
> +++ b/test/internals/libproc/tst.plddGrabPIE32.r.p
> @@ -0,0 +1,3 @@
> +#!/bin/sed -f
> +# Handle merged-usr systems where /lib == /usr/lib.
> +s:/usr/lib:/lib:g
> --
> 2.46.0
>
next prev parent reply other threads:[~2024-10-12 3:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-29 20:15 [PATCH 1/6] test: fix missing line continuation in tst.perf-types.sh Sam James
2024-08-29 20:15 ` [PATCH 2/6] test: fix broken shebang in tst.plddGrab32.sh Sam James
2024-10-12 3:30 ` Kris Van Hees
2024-08-29 20:15 ` [PATCH 3/6] test: awk -> gawk where we use strtonum Sam James
2024-10-12 3:30 ` Kris Van Hees
2024-08-29 20:15 ` [PATCH 4/6] test: fix 'CPU' typo Sam James
2024-10-12 3:30 ` Kris Van Hees
2024-08-29 20:15 ` [PATCH 5/6] test: libproc: cater to merged-usr systems Sam James
2024-10-12 3:30 ` Kris Van Hees [this message]
2024-08-29 20:15 ` [PATCH 6/6] test: awk -> gawk universally Sam James
2024-10-12 3:31 ` Kris Van Hees
2024-10-12 3:29 ` [PATCH 1/6] test: fix missing line continuation in tst.perf-types.sh Kris Van Hees
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=ZwntandHaYD8a9Qr@oracle.com \
--to=kris.van.hees@oracle.com \
--cc=dtrace@lists.linux.dev \
--cc=sam@gentoo.org \
/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