From 184f864b877a69779c729c08e0b5e0626ce2f0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= Date: Wed, 20 Sep 2023 10:53:52 +0200 Subject: [PATCH] Use uname -m instead of uname -i -i (and -p) just say "unknown", since Fedora 38. See [1] and [2] for the original commit and more details. Kudos to awilliam@redhat.com for fixing this in Fedora tests first. * [1] https://src.fedoraproject.org/rpms/binutils/c/78d9a63f8ba7e445010ac35ef6620676c33fc645?branch=rawhide * [2] https://bugzilla.redhat.com/show_bug.cgi?id=2203350 --- tests/dts-probe-binaries/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/dts-probe-binaries/test.sh b/tests/dts-probe-binaries/test.sh index 32280cb..bed4fae 100755 --- a/tests/dts-probe-binaries/test.sh +++ b/tests/dts-probe-binaries/test.sh @@ -122,7 +122,7 @@ rlJournalStart ./popcnt > a rlRun "$ADDR2LINE -e popcnt $(cat a) > r" # We know that main is at line 4. But on PPC we get ??:0... -if test ! $(uname -i) = "ppc64"; then +if test ! $(uname -m) = "ppc64"; then rlAssertGrep "popcnt.c:4" r fi rm -vf [ra] @@ -205,7 +205,7 @@ fi fi # Try -P --size-sort. rlRun "nm -P --size-sort localplt > p" -if test $(uname -i) = "ppc64" -a $(rlGetDistroRelease) -gt 5; then +if test $(uname -m) = "ppc64" -a $(rlGetDistroRelease) -gt 5; then rlAssertGrep "__libc_csu_init D" p rlAssertGrep "main D" p else