Remove gdb-test-pid0-core.patch

The patch gdb-test-pid0-core.patch only contains a test. A similar test has been merged upstream in commit 8bcead69665, so I propose that we drop this patch from Fedora, the test will be picked up next time we rebase.
2023-07-04 14:29:08 +01:00 · 2023-07-04 14:29:08 +01:00 · dd38aa36ce
commit dd38aa36ce
parent 2b402b25f4
5 changed files with 23 additions and 117 deletions
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@ -113,72 +113,68 @@ Patch027: gdb-test-bt-cfi-without-die.patch
 #=fedoratest
 Patch028: gdb-bz634108-solib_address.patch

-# New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435).
-#=fedoratest
-Patch029: gdb-test-pid0-core.patch
-
 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch030: gdb-test-dw2-aranges.patch
+Patch029: gdb-test-dw2-aranges.patch

 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedoratest: Compatibility with RHELs (unchecked which ones).
-Patch031: gdb-glibc-strstr-workaround.patch
+Patch030: gdb-glibc-strstr-workaround.patch

 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch032: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch031: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch

 # Import regression test for `gdb/findvar.c:417: internal-error:
 # read_var_value: Assertion `frame' failed.' (RH BZ 947564) from RHEL 6.5.
 #=fedoratest
-Patch033: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch032: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch

 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch034: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch033: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch

 # Fix 'gdb gives highly misleading error when debuginfo pkg is present,
 # but not corresponding binary pkg' (RH BZ 981154).
 #=push+jan
-Patch035: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch034: 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
-Patch036: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch035: gdb-rhbz1156192-recursive-dlopen-test.patch

 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch037: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch036: gdb-rhbz1149205-catch-syscall-after-fork-test.patch

 # Fix 'backport GDB 7.4 fix to RHEL 6.6 GDB' [Original Sourceware bug
 # description: 'C++ (and objc): Internal error on unqualified name
 # re-set', PR 11657] (RH BZ 1186476).
 #=fedoratest
-Patch038: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+Patch037: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch

 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch039: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch038: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch

 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch040: gdb-fedora-libncursesw.patch
+Patch039: gdb-fedora-libncursesw.patch

 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch041: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch040: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch

 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch042: gdb-container-rh-pkg.patch
+Patch041: gdb-container-rh-pkg.patch

 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch043: gdb-linux_perf-bundle.patch
+Patch042: gdb-linux_perf-bundle.patch

 # Update gdb-add-index.sh such that, when the GDB environment
 # variable is not set, the script is smarter than just looking for
@ -192,22 +188,22 @@ Patch043: gdb-linux_perf-bundle.patch
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #
 #=fedora
-Patch044: gdb-add-index.patch
+Patch043: gdb-add-index.patch

 # [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
 # =fedoratest
-Patch045: gdb-rhbz1553104-s390x-arch12-test.patch
+Patch044: gdb-rhbz1553104-s390x-arch12-test.patch

 # Backport "Fix a potential illegal memory access in the BFD library..."
 # (Nick Clifton, binutils/29988)
-Patch046: gdb-binutils29988-read_indexed_address.patch
+Patch045: gdb-binutils29988-read_indexed_address.patch

 # Backport upstream patch fixing a "dangling pointer" build problem
 # first seen when building with GCC 13.1.1 20230426 (Red Hat ;; 13.1.1-1).
-Patch047: gdb-rhbz2192105-ftbs-dangling-pointer
+Patch046: gdb-rhbz2192105-ftbs-dangling-pointer

 # Backport two commits, 0ad504dd464 and ea70f941f9b, from Lancelot SIX
 # which prevent repeated warnings from being printed while loading a
 # core file. (RH BZ 2160211)
-Patch048: gdb-rhbz2160211-excessive-core-file-warnings.patch
+Patch047: gdb-rhbz2160211-excessive-core-file-warnings.patch

--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@ -45,4 +45,3 @@
 %patch -p1 -P045
 %patch -p1 -P046
 %patch -p1 -P047
-%patch -p1 -P048
--- a/1
+++ b/1
@ -26,7 +26,6 @@ gdb-archer-next-over-throw-cxx-exec.patch
 gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 gdb-test-bt-cfi-without-die.patch
 gdb-bz634108-solib_address.patch
-gdb-test-pid0-core.patch
 gdb-test-dw2-aranges.patch
 gdb-glibc-strstr-workaround.patch
 gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
--- a/gdb-test-pid0-core.patch
+++ b/gdb-test-pid0-core.patch
@ -1,92 +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-test-pid0-core.patch
-
-;; New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435).
-;;=fedoratest
-
-https://bugzilla.redhat.com/show_bug.cgi?id=611435
-
-Fix:
-Re: [RFA]corelow.c: Add tid to add_to_thread_list
-http://sourceware.org/ml/gdb-patches/2010-08/msg00085.html
-http://sourceware.org/ml/gdb-cvs/2010-08/msg00026.html
-2e5bcfdef1ec3883d48c3f87a4be5c0dff25e17e
-
-diff --git a/gdb/testsuite/gdb.arch/x86_64-pid0-core.core.bz2.uu b/gdb/testsuite/gdb.arch/x86_64-pid0-core.core.bz2.uu
-new file mode 100644
--- /dev/null
-+++ b/gdb/testsuite/gdb.arch/x86_64-pid0-core.core.bz2.uu
-@@ -0,0 +1,20 @@
-+begin 600 x86_64-pid0-core.core.bz2
-+M0EIH.3%!629362,CA>P!$/'_____^*#EZ-A!SP36P&_:G0#=14``04A&8,'U
-+M2*9`>$$)P`*RN"#*;#4R()IJ8C$TT&FC3$&@`T`#:C1H8C0T,@,FC,D"4T2!
-+M"/2CU'B90]31ZAD#U`&AZF@/4:``!HT&F@!H<`#0-`-#0``#3$-&F@```#0R
-+M``#")2FD]2>4]0TTT-!HTT--,0,"#$`R!I@AD`#1H,3&GZT.4TO$#H40/`0C
-+M2$IRXS,<55!8T,&&,R.Z441"?J9I%G6GUA2!.[]Z"C5S[&19,%VS7E6[3"60
-+M@`-*2G)QEQ(;?0Y<=MK]/U?Q)LB%+F37TJ9BI*46)H'*Z@V"`"$"P7]&<Q<?
-+M>XZ:JE0E<*:#1M$P3G]>VCI)(A!O$64`5$4`E$$-.``7&(09`8HO`B6K!Q^&
-+M562%N)2+0@*HB@%D@5$%!*0!L1&0D4D6\:-$A`)`+<6D82PP*H(J(H!?F;0$
-+M%PXB7N!2D4!44`W7"ADEQM6<B]J<B(%1GF'5*0;_00KO55=43LPR0,Q?N72`
-+M8"W*_;DV<AN#,XRU]Q-J2FDAFKAQ(9A+ZK$MCY#EI8:W-(15>O9TBO5,_]1)
-+M($Q2))#),UE,QQK)E$,3D\W.>!4)QO8A_@^Z_SXS<OEHM*+"M8I1)-C(=DIJ
-+MW+@WN)O)YO;3:I9YW-A$)N'2<A`F3),R3"3-'"S3E1;6VE*_95KD<!0050(G
-+M,JV"N(Z:@0E#)50BSF)$T6_IN)#"Z8PLQ4UQ9]@Z'+;T]990-:Y:2`P26#!D
-+MV+0L6"X@C9`GHAGSY7)%LWOY+E[2/>4;Q8=HV6[:&$@2$@$R29IBW)K%3"O`
-+M9^Y0YJ&BXY1U2HTZ5)2H-V\_(.DZHWE+C#WS($(!I"3CUH2#(+(OWUV"*<<9
-+MJ%A!J[%O.P&V%GI.`L7<1@0>,^1F\MY=V5UT,&NOG%7TTZ[03!@BHB@&)<A^
-+4B.Z!/,0-IZ^W_Q=R13A0D",CA>P`
-+`
-+end
-diff --git a/gdb/testsuite/gdb.arch/x86_64-pid0-core.exp b/gdb/testsuite/gdb.arch/x86_64-pid0-core.exp
-new file mode 100644
--- /dev/null
-+++ b/gdb/testsuite/gdb.arch/x86_64-pid0-core.exp
-@@ -0,0 +1,46 @@
-+# This testcase is part of GDB, the GNU debugger.
-+#
-+# Copyright 2010 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 2 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, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+# Some kernel core files have PID 0 - for the idle task.
-+
-+if ![istarget "x86_64-*-*"] {
-+    verbose "Skipping x86_64-pid0-core test."
-+    return
-+}
-+
-+set testfile "x86_64-pid0-core"
-+set corebz2uufile ${srcdir}/${subdir}/${testfile}.core.bz2.uu
-+set corefile [standard_output_file ${testfile}.core]
-+
-+if {[catch "system \"uudecode -o - ${corebz2uufile} | bzip2 -dc >${corefile}\""] != 0} {
-+    untested "failed uudecode or bzip2"
-+    return -1
-+}
-+file stat ${corefile} corestat
-+if {$corestat(size) != 8798208} {
-+    untested "uudecode or bzip2 produce invalid result"
-+    return -1
-+}
-+
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
-+
-+# Former crash was:
-+# thread.c:884: internal-error: switch_to_thread: Assertion `inf != NULL' failed.
-+gdb_test "core-file ${corefile}" "Program terminated with signal (11|SIGSEGV), Segmentation fault\\.\r\n.*"
--- a/gdb.spec
+++ b/gdb.spec
@ -1252,6 +1252,10 @@ fi
 %endif

 %changelog
+* Tue Jul  4 2023 Andrew Burgess <aburgess@redhat.com>
+- Remove gdb-test-pid0-core.patch.  This work has been upstreamed in
+  commit 8bcead69665.
+
 * Sat Jul  1 2023 Mark Wielaard <mjw@fedoraproject.org> - 13.2-4
 - Adjust gdb-add-index.patch to be silent about which gdb.