[rpms/gdb] gdb-17.2-rebase-f44: remove patch gdb-6.6-testsuite-timeouts.patch

[rpms/gdb] gdb-17.2-rebase-f44: remove patch gdb-6.6-testsuite-timeouts.patch

[Andrew Burgess]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : 7c66c1c8ddeb7837c163a96c830262caee829c9a
            Author : Andrew Burgess <aburgess@redhat.com>
            Date   : 2024-11-12T14:51:08+00:00
            Stats  : +24/-58 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/7c66c1c8ddeb7837c163a96c830262caee829c9a?branch=gdb-17.2-rebase-f44

            Log:
            remove patch gdb-6.6-testsuite-timeouts.patch

Remove gdb-6.6-testsuite-timeouts.patch.  This patch worked around
that these tests didn't use gdb_test and/or gdb_test_multiple.  If GDB
failed and ended up at an interactive prompt then we would have to
wait for a timeout while gdb_test/gdb_test_multiple will spot the
interactive prompt and immediately exit.

I updated the tests upstream to use gdb_test/gdb_test_multiple, so
this patch is no longer required:

  commit 06b8b0ad976aa3ad5864bbe4b196ba737f677efb
  Date:   Sat Nov 9 15:02:15 2024 +0000

      gdb/testsuite: some cleanups in gdb.base/annota{1,3}.exp tests

I'm not proposing to back-port the upstream test change.  This does
mean that if we break GDB, such that we hit an interactive prompt,
between now and the next rebase, then the test will end up waiting for
lots of timeouts, which could be painful.  So lets not break GDB like
that!  Honestly, I don't see this as a huge problem, if we do hit
these timeouts its likely only once, then we'll fix whatever we broke
in GDB.  Lets just drop this patch.

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index bf6ba47..6b0d52a 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -10,79 +10,75 @@ Patch002: gdb-6.3-gstack-20050411.patch
 #=fedoratest
 Patch003: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
 
-# Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
-#=fedoratest
-Patch004: gdb-6.6-testsuite-timeouts.patch
-
 # Support for stepping over PPC atomic instruction sequences (BZ 237572).
 #=fedoratest
-Patch005: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
+Patch004: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
 
 # Test leftover zombie process (BZ 243845).
 #=fedoratest
-Patch006: gdb-6.5-bz243845-stale-testing-zombie-test.patch
+Patch005: gdb-6.5-bz243845-stale-testing-zombie-test.patch
 
 # New locating of the matching binaries from the pure core file (build-id).
 #=push+jan
-Patch007: gdb-6.6-buildid-locate.patch
+Patch006: gdb-6.6-buildid-locate.patch
 
 # Fix loading of core files without build-ids but with build-ids in executables.
 # Load strictly build-id-checked core files only if no executable is specified
 # (Jan Kratochvil, RH BZ 1339862).
 #=push+jan
-Patch008: gdb-6.6-buildid-locate-solib-missing-ids.patch
+Patch007: gdb-6.6-buildid-locate-solib-missing-ids.patch
 
 # Test gcore memory and time requirements for large inferiors.
 #=fedoratest
-Patch009: gdb-6.5-gcore-buffer-limit-test.patch
+Patch008: gdb-6.5-gcore-buffer-limit-test.patch
 
 # Test GCORE for shmid 0 shared memory mappings.
 #=fedoratest: But it is broken anyway, sometimes the case being tested is not reproducible.
-Patch010: gdb-6.3-mapping-zero-inode-test.patch
+Patch009: gdb-6.3-mapping-zero-inode-test.patch
 
 # Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 #=fedoratest
-Patch011: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+Patch010: gdb-6.8-bz466901-backtrace-full-prelinked.patch
 
 # Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 #=fedoratest
-Patch012: gdb-archer-next-over-throw-cxx-exec.patch
+Patch011: gdb-archer-next-over-throw-cxx-exec.patch
 
 # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
 #=fedoratest
-Patch013: gdb-test-bt-cfi-without-die.patch
+Patch012: gdb-test-bt-cfi-without-die.patch
 
 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch014: gdb-test-dw2-aranges.patch
+Patch013: gdb-test-dw2-aranges.patch
 
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch015: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch014: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
 
 # Fix 'gdb gives highly misleading error when debuginfo pkg is present,
 # but not corresponding binary pkg' (RH BZ 981154).
 #=push+jan
-Patch016: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch015: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 
 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch017: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch016: gdb-rhbz1156192-recursive-dlopen-test.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch018: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch017: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch019: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch018: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch020: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch019: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
 # Update gdb-add-index.sh such that, when the GDB environment
 # variable is not set, the script is smarter than just looking for
@@ -96,15 +92,15 @@ Patch020: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #
 #=fedora
-Patch021: gdb-add-index.patch
+Patch020: gdb-add-index.patch
 
 # Backport upstream commit 7db795bc67a.
-Patch022: gdb-remove-use-of-py-isascii
+Patch021: gdb-remove-use-of-py-isascii
 
 # Not a backport.  Add a new script which hooks into GDB and suggests
 # RPMs to install when GDB finds an objfile with no debug info.
-Patch023: gdb-add-rpm-suggestion-script.patch
+Patch022: gdb-add-rpm-suggestion-script.patch
 
 
-Patch024: gdb-catchpoint-re-set.patch
+Patch023: gdb-catchpoint-re-set.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index 4490cd8..80fa6ac 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -21,4 +21,3 @@
 %patch -p1 -P021
 %patch -p1 -P022
 %patch -p1 -P023
-%patch -p1 -P024

diff --git a/_patch_order b/_patch_order
index ef1ef77..3ad29b4 100644
--- a/_patch_order
+++ b/_patch_order
@@ -1,7 +1,6 @@
 gdb-6.3-rh-testversion-20041202.patch
 gdb-6.3-gstack-20050411.patch
 gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
-gdb-6.6-testsuite-timeouts.patch
 gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
 gdb-6.5-bz243845-stale-testing-zombie-test.patch
 gdb-6.6-buildid-locate.patch

diff --git a/gdb-6.6-testsuite-timeouts.patch b/gdb-6.6-testsuite-timeouts.patch
deleted file mode 100644
index 9a31a5b..0000000
--- a/gdb-6.6-testsuite-timeouts.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.6-testsuite-timeouts.patch
-
-;; Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
-;;=fedoratest
-
-diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
---- a/gdb/testsuite/gdb.base/annota1.exp
-+++ b/gdb/testsuite/gdb.base/annota1.exp
-@@ -37,6 +37,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
- 
- clean_restart ${binfile}
- 
-+gdb_test "set breakpoint pending off" "" "Avoid lockup on nonexisting functions"
-+
- # The commands we test here produce many lines of output; disable "press 
- # <return> to continue" prompts.
- gdb_test_no_output "set height 0"
-diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
---- a/gdb/testsuite/gdb.base/annota3.exp
-+++ b/gdb/testsuite/gdb.base/annota3.exp
-@@ -36,6 +36,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
- 
- clean_restart ${binfile}
- 
-+gdb_test "set breakpoint pending off" "" "Avoid lockup on nonexisting functions"
-+
- # The commands we test here produce many lines of output; disable "press 
- # <return> to continue" prompts.
- gdb_test_no_output "set height 0"

diff --git a/gdb.spec b/gdb.spec
index 3b554f5..2803e1b 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -928,6 +928,10 @@ fi
 # endif scl
 
 %changelog
+* Tue Nov 12 2024 Andrew Burgess <aburgess@redhat.com>
+- Remove gdb-6.6-testsuite-timeouts.patch.  I updated the upstream
+  tests in commit 06b8b0ad976 so this patch is no longer useful.
+
 * Wed Nov  6 2024 Mark Wielaard <mjw@fedoraproject.org> - 15.2-2
 - Resolves: rhbz#2323513
   - gdb-add-index.patch: Replace which with command -v