From ee3721dc8859be1c2393254eee379ed3115135c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= <mprchlik@redhat.com>
Date: Mon, 15 Jan 2024 14:01:46 +0100
Subject: [PATCH] Fix dts-probe-binaries to match recent binutils

Includes the following changes:

* Un-break test Sanity/dts-probe-binaries for glibc 2.34
  https://src.fedoraproject.org/rpms/binutils/c/58f355fcc3814a3174cf3c870adf57cdcef52cf7?branch=rawhide
* Fix RHEL's test Sanity/dts-probe-binaries
  https://src.fedoraproject.org/rpms/binutils/c/64cf74e8a3e09bb14b64f2c7ac2b6822dbda34c5?branch=rawhide
---
 tests/dts-probe-binaries/test.sh | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/tests/dts-probe-binaries/test.sh b/tests/dts-probe-binaries/test.sh
index bed4fae..6b4c997 100755
--- a/tests/dts-probe-binaries/test.sh
+++ b/tests/dts-probe-binaries/test.sh
@@ -196,20 +196,13 @@ fi
     if [ "`rlGetPrimaryArch`" != "ppc64" ] || [ ! rlIsRHEL 7 ]; then
         rlAssertGrep "__gmon_start__" u
     fi
-    if [ "$COLLECTIONS" != "devtoolset-11" ]; then
-        rlAssertGrep "printf@@GLIBC" u
-        rlAssertGrep "__libc_start_main@@GLIBC" u
-    else
-        rlAssertGrep "printf@GLIBC" u
-        rlAssertGrep "__libc_start_main@GLIBC" u
-    fi
+    rlAssertGrep "printf@GLIBC" u
+    rlAssertGrep "__libc_start_main@GLIBC" u
     # Try -P --size-sort.
     rlRun "nm -P --size-sort localplt > p"
 if test $(uname -m) = "ppc64" -a $(rlGetDistroRelease) -gt 5; then
-    rlAssertGrep "__libc_csu_init D" p
     rlAssertGrep "main D" p
 else
-    rlAssertGrep "__libc_csu_init T" p
     rlAssertGrep "main T" p
 fi
     rlAssertGrep "completed.* b" p
@@ -300,6 +293,7 @@ fi
 
     # Try -h.
     rlRun "$READELF -Wh virt > h"
+    rlRun "cat h"
     rlAssertGrep "ELF Header:" h
     rlAssertGrep "7f 45 4c 46" h
     rlAssertGrep "EXEC (Executable file)" h
@@ -367,7 +361,7 @@ fi
     rlRun "$READELF -Wh /bin/true > H"
     rlAssertGrep "ELF Header:" H
     rlAssertGrep "7f 45 4c 46" H
-    if rlIsRHEL 8; then
+    if rlIsRHEL ">= 8"; then
       rlAssertGrep "DYN (Shared object file)" H
     else
       rlAssertGrep "EXEC (Executable file)" H