[rpms/gdb] gdb-17.2-rebase-f44: Remove local patch gdb-simultaneous-step-resume-breakpoint.patch.

[rpms/gdb] gdb-17.2-rebase-f44: Remove local patch gdb-simultaneous-step-resume-breakpoint.patch.

[Guinevere Larsen]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : 22942802eba2e0504dfcb127e5fc3ef727d873a2
            Author : Guinevere Larsen <guinevere@redhat.com>
            Date   : 2024-11-05T17:02:03-03:00
            Stats  : +17/-181 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/22942802eba2e0504dfcb127e5fc3ef727d873a2?branch=gdb-17.2-rebase-f44

            Log:
            Remove local patch gdb-simultaneous-step-resume-breakpoint.patch.

This test only contains a testcase, and the upstream tests
gdb.threads/multiple-step-overs.exp and
gdb.threads/step-over-lands-on-breakpoint.exp should cover it.

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index ee30eb7..bf6ba47 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -44,49 +44,45 @@ Patch010: gdb-6.3-mapping-zero-inode-test.patch
 #=fedoratest
 Patch011: gdb-6.8-bz466901-backtrace-full-prelinked.patch
 
-# New test for step-resume breakpoint placed in multiple threads at once.
-#=fedoratest
-Patch012: gdb-simultaneous-step-resume-breakpoint-test.patch
-
 # Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 #=fedoratest
-Patch013: gdb-archer-next-over-throw-cxx-exec.patch
+Patch012: gdb-archer-next-over-throw-cxx-exec.patch
 
 # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
 #=fedoratest
-Patch014: gdb-test-bt-cfi-without-die.patch
+Patch013: gdb-test-bt-cfi-without-die.patch
 
 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch015: gdb-test-dw2-aranges.patch
+Patch014: gdb-test-dw2-aranges.patch
 
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch016: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch015: 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
-Patch017: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch016: 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
-Patch018: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch017: gdb-rhbz1156192-recursive-dlopen-test.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch019: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch018: 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
-Patch020: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch019: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch021: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch020: 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
@@ -100,15 +96,15 @@ Patch021: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #
 #=fedora
-Patch022: gdb-add-index.patch
+Patch021: gdb-add-index.patch
 
 # Backport upstream commit 7db795bc67a.
-Patch023: gdb-remove-use-of-py-isascii
+Patch022: 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.
-Patch024: gdb-add-rpm-suggestion-script.patch
+Patch023: gdb-add-rpm-suggestion-script.patch
 
 
-Patch025: gdb-catchpoint-re-set.patch
+Patch024: gdb-catchpoint-re-set.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index 8c29eae..4490cd8 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -22,4 +22,3 @@
 %patch -p1 -P022
 %patch -p1 -P023
 %patch -p1 -P024
-%patch -p1 -P025

diff --git a/_patch_order b/_patch_order
index 6979f4c..ef1ef77 100644
--- a/_patch_order
+++ b/_patch_order
@@ -9,7 +9,6 @@ gdb-6.6-buildid-locate-solib-missing-ids.patch
 gdb-6.5-gcore-buffer-limit-test.patch
 gdb-6.3-mapping-zero-inode-test.patch
 gdb-6.8-bz466901-backtrace-full-prelinked.patch
-gdb-simultaneous-step-resume-breakpoint-test.patch
 gdb-archer-next-over-throw-cxx-exec.patch
 gdb-test-bt-cfi-without-die.patch
 gdb-test-dw2-aranges.patch

diff --git a/gdb-simultaneous-step-resume-breakpoint-test.patch b/gdb-simultaneous-step-resume-breakpoint-test.patch
deleted file mode 100644
index 5e1315b..0000000
--- a/gdb-simultaneous-step-resume-breakpoint-test.patch
+++ /dev/null
@@ -1,162 +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-simultaneous-step-resume-breakpoint-test.patch
-
-;; New test for step-resume breakpoint placed in multiple threads at once.
-;;=fedoratest
-
-diff --git a/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.c b/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.c
-@@ -0,0 +1,79 @@
-+/* Copyright 2009 Free Software Foundation, Inc.
-+
-+   Written by Fred Fish of Cygnus Support
-+   Contributed by Cygnus Support
-+
-+   This file is part of GDB.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+/* Test multiple threads stepping into a .debug_line-less function with
-+   a breakpoint placed on its return-to-caller point.  */
-+
-+#include <pthread.h>
-+#include <assert.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <stdio.h>
-+
-+#define THREADS 3
-+
-+static void *
-+func (void *unused)
-+{
-+  int i;
-+
-+  errno = 0;
-+  i = 0xdeadf00d;
-+  i = sleep (THREADS);	/* sleep-call */
-+  if (errno != 0)	/* sleep-after */
-+    perror ("sleep");
-+
-+  /* The GDB bug with forgotten step-resume breakpoint could leave stale
-+     breakpoint on the I assignment making it a nop.  */
-+  if (i == 0xdeadf00d)
-+    assert (0);
-+
-+  assert (i == 0);
-+
-+  pthread_exit (NULL);
-+}
-+
-+int
-+main (void)
-+{
-+  pthread_t threads[THREADS];
-+  int threadi;
-+
-+  for (threadi = 0; threadi < THREADS; threadi++)
-+    {
-+      int i;
-+
-+      i = pthread_create (&threads[threadi], NULL, func, NULL);
-+      assert (i == 0);
-+
-+      i = sleep (1);
-+      assert (i == 0);
-+    }
-+
-+  for (threadi = 0; threadi < THREADS; threadi++)
-+    {
-+      int i;
-+
-+      i = pthread_join (threads[threadi], NULL);
-+      assert (i == 0);
-+    }
-+
-+  return 0;	/* final-exit */
-+}
-diff --git a/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.exp b/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.exp
-@@ -0,0 +1,65 @@
-+# Copyright (C) 2009 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+# Test multiple threads stepping into a .debug_line-less function with
-+# a breakpoint placed on its return-to-caller point.
-+
-+set testfile simultaneous-step-resume-breakpoint
-+set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
-+
-+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-+    return -1
-+}
-+
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
-+
-+# Ensure we have no debuginfo for the `sleep' call itself (=for libc).
-+gdb_test "set debug-file-directory /DoesNotExist"
-+
-+gdb_load ${binfile}
-+if ![runto_main] {
-+   return -1
-+}
-+
-+# Red Hat vendor patch does set it to "step" by default.
-+gdb_test "set scheduler-locking off"
-+
-+gdb_breakpoint [gdb_get_line_number "final-exit"]
-+
-+gdb_breakpoint [gdb_get_line_number "sleep-call"]
-+gdb_continue_to_breakpoint "sleep-call"
-+
-+gdb_test "step" "sleep-call.*" "step thread 1"
-+gdb_test "step" "sleep-call.*" "step thread 2"
-+gdb_test "step" "sleep-after.*" "step thread 3"
-+
-+set test "first continue"
-+gdb_test_multiple "continue" $test {
-+    -re "final-exit.*$gdb_prompt $" {
-+	# gdb-7.0.
-+	pass $test
-+	return
-+    }
-+    -re "sleep-after.*$gdb_prompt $" {
-+	# Fedora/RHEL branch.
-+	pass $test
-+    }
-+}
-+
-+gdb_test "continue" "sleep-after.*" "second continue"
-+gdb_test "continue" "final-exit.*" "third continue"

diff --git a/gdb.spec b/gdb.spec
index 5e5fe12..6d6cc51 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -931,6 +931,10 @@ fi
 # endif scl
 
 %changelog
+* Tue Nov  5 2024 Guinevere Larsen <guinevere@redhat.com>
+- Remove gdb-simultaneous-step-resume-breakpoint.patch
+  This test is covered by a combination of upstream tests already.
+
 * Thu Oct 24 2024 Guinevere Larsen <guinevere@redhat.com>
 - Make the GDB package provide the libdir/gdb folder, so that packages
   that provide a JIT reader don't need to create it on their own.