From d5fdfa740ca712e6846115176e7995206e666f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= <mprchlik@redhat.com>
Date: Mon, 4 Nov 2024 13:08:07 +0100
Subject: [PATCH] Batch update of various changes

---
 .../main.fmf                                           |  4 ++++
 .../main.fmf                                           |  5 +++++
 .../repro.sh                                           |  2 +-
 tests/testsuite/interesting-cases.sh                   |  2 +-
 tests/testsuite/main.fmf                               | 10 +++++-----
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/tests/bugs/Add-.debug_pubtypes-and-.debug_ranges-to-builtin-ld-linker-script/main.fmf b/tests/bugs/Add-.debug_pubtypes-and-.debug_ranges-to-builtin-ld-linker-script/main.fmf
index df1f728..51d9c05 100644
--- a/tests/bugs/Add-.debug_pubtypes-and-.debug_ranges-to-builtin-ld-linker-script/main.fmf
+++ b/tests/bugs/Add-.debug_pubtypes-and-.debug_ranges-to-builtin-ld-linker-script/main.fmf
@@ -12,6 +12,10 @@ environment+:
   DWARF5: "yes"
 
 adjust+:
+  - when: distro == rhel-8.10
+    environment+:
+      DWARF5: "no"
+
   - when: distro == rhel-8.6.0
     environment+:
       DWARF5: "no"
diff --git a/tests/bugs/Avoid-creating-gaps-between-adjacent-LOAD-segments/main.fmf b/tests/bugs/Avoid-creating-gaps-between-adjacent-LOAD-segments/main.fmf
index 453af5d..edb6df9 100644
--- a/tests/bugs/Avoid-creating-gaps-between-adjacent-LOAD-segments/main.fmf
+++ b/tests/bugs/Avoid-creating-gaps-between-adjacent-LOAD-segments/main.fmf
@@ -5,6 +5,11 @@ duration: 24h
 require+:
   - rpm-build
   - tree
+  - /usr/bin/python3
 
 link+:
   - verifies: https://issues.redhat.com/browse/RHEL-45873
+
+adjust+:
+  - when: distro < rhel-9.5
+    enabled: false
diff --git a/tests/bugs/Avoid-creating-gaps-between-adjacent-LOAD-segments/repro.sh b/tests/bugs/Avoid-creating-gaps-between-adjacent-LOAD-segments/repro.sh
index 84c878a..a537ee4 100755
--- a/tests/bugs/Avoid-creating-gaps-between-adjacent-LOAD-segments/repro.sh
+++ b/tests/bugs/Avoid-creating-gaps-between-adjacent-LOAD-segments/repro.sh
@@ -14,7 +14,7 @@ test() {
     f=obj$y
     gcc -O2 -fpie -pie -DN=$y t.c -Wl,-z,relro,-z,now -o $f
 
-    PYTHONPATH="$GLIBC_SCRIPTS:$PYTHONPATH" python tst-load-segment-gaps.py $f >> verbose.log
+    PYTHONPATH="$GLIBC_SCRIPTS:$PYTHONPATH" python3 tst-load-segment-gaps.py $f >> verbose.log
     ret=$?
 
     rm $f
diff --git a/tests/testsuite/interesting-cases.sh b/tests/testsuite/interesting-cases.sh
index 9f7f085..fa80413 100644
--- a/tests/testsuite/interesting-cases.sh
+++ b/tests/testsuite/interesting-cases.sh
@@ -106,7 +106,7 @@ function verify_interesting_cases () {
         #
         # RHEL-9.5.0
         #
-        elif rlIsRHEL ">=9.5" "<10"; then
+        elif rlIsRHEL ">=9.5" && rlIsRHEL "<10"; then
             if [ "$tool" = "binutils" ]; then
                 [ "$arch" == "aarch64" ] && verify_test "Check if efi app format is recognized" \
                                             "$tool_log" \
diff --git a/tests/testsuite/main.fmf b/tests/testsuite/main.fmf
index 7c6f94b..344df55 100644
--- a/tests/testsuite/main.fmf
+++ b/tests/testsuite/main.fmf
@@ -49,11 +49,11 @@ adjust+:
     environment+:
       MAY_BUILD_OTHER_ARCHES: "no"
 
-  - because: "On RHEL-8.10.0 and newer, system binutils build extra binaries for cross compilation"
-    when: distro == rhel-8.10 and collection is not defined
-    test: "$WITH_SCL ./test-with-cross.sh"
-    environment+:
-      MAY_BUILD_OTHER_ARCHES: "no"
+#  - because: "On RHEL-8.10.0 and newer, system binutils build extra binaries for cross compilation"
+#    when: distro == rhel-8.10 and collection is not defined
+#    test: "$WITH_SCL ./test-with-cross.sh"
+#    environment+:
+#      MAY_BUILD_OTHER_ARCHES: "no"
 
   - because: "On RHEL-8.10.0 and newer, gcc-toolset-14 binutils build has extra directory levels"
     when: distro == rhel-8.10 and collection == gcc-toolset-14