From a5f9e287018828b95d60c3c5997d7acd036d3c6e Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Thu, 26 Jan 2023 14:44:38 +0000 Subject: [PATCH] Remove gdb-6.3-focus-cmd-prev-test.patch this test is now upstream This upstream commit: commit 24f3aded1d42f515527e2de7e8e9e26f0b77c932 Date: Tue Dec 20 15:01:29 2022 +0000 gdb/testsuite/tui: more testing of the 'focus' command replaces the tests added in gdb-6.3-focus-cmd-prev-test.patch. As this patch was only adding a test I see no need to back-port the upstream commit, we'll pick this up in a later rebase. --- _gdb.spec.Patch.include | 86 +++++++++++++++---------------- _gdb.spec.patch.include | 1 - _patch_order | 1 - gdb-6.3-focus-cmd-prev-test.patch | 53 ------------------- 4 files changed, 41 insertions(+), 100 deletions(-) delete mode 100644 gdb-6.3-focus-cmd-prev-test.patch diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include index e702bc4..4404807 100644 --- a/_gdb.spec.Patch.include +++ b/_gdb.spec.Patch.include @@ -109,141 +109,137 @@ Patch026: gdb-6.5-gcore-buffer-limit-test.patch #=fedoratest: But it is broken anyway, sometimes the case being tested is not reproducible. Patch027: gdb-6.3-mapping-zero-inode-test.patch -# Test a crash on `focus cmd', `focus prev' commands. -#=fedoratest -Patch028: gdb-6.3-focus-cmd-prev-test.patch - # Test various forms of threads tracking across exec() (BZ 442765). #=fedoratest -Patch029: gdb-6.8-bz442765-threaded-exec-test.patch +Patch028: gdb-6.8-bz442765-threaded-exec-test.patch # Test a crash on libraries missing the .text section. #=fedoratest -Patch030: gdb-6.5-section-num-fixup-test.patch +Patch029: gdb-6.5-section-num-fixup-test.patch # Fix resolving of variables at locations lists in prelinked libs (BZ 466901). #=fedoratest -Patch031: gdb-6.8-bz466901-backtrace-full-prelinked.patch +Patch030: gdb-6.8-bz466901-backtrace-full-prelinked.patch # New test for step-resume breakpoint placed in multiple threads at once. #=fedoratest -Patch032: gdb-simultaneous-step-resume-breakpoint-test.patch +Patch031: gdb-simultaneous-step-resume-breakpoint-test.patch # Fix GNU/Linux core open: Can't read pathname for load map: Input/output error. # Fix regression of undisplayed missing shared libraries caused by a fix for. #=fedoratest: It should be in glibc: libc-alpha: <20091004161706.GA27450@.*> -Patch033: gdb-core-open-vdso-warning.patch +Patch032: gdb-core-open-vdso-warning.patch # Workaround ccache making lineno non-zero for command-line definitions. #=fedoratest: ccache is rarely used and it is even fixed now. -Patch034: gdb-ccache-workaround.patch +Patch033: gdb-ccache-workaround.patch # Testcase for "Do not make up line information" fix by Daniel Jacobowitz. #=fedoratest -Patch035: gdb-lineno-makeup-test.patch +Patch034: gdb-lineno-makeup-test.patch # Test power7 ppc disassembly. #=fedoratest -Patch036: gdb-ppc-power7-test.patch +Patch035: gdb-ppc-power7-test.patch # Fix follow-exec for C++ programs (bugreported by Martin Stransky). #=fedoratest -Patch037: gdb-archer-next-over-throw-cxx-exec.patch +Patch036: gdb-archer-next-over-throw-cxx-exec.patch # Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879). #=push+jan -Patch038: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch +Patch037: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604). #=fedoratest -Patch039: gdb-test-bt-cfi-without-die.patch +Patch038: gdb-test-bt-cfi-without-die.patch # Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108). #=fedoratest -Patch040: gdb-bz634108-solib_address.patch +Patch039: gdb-bz634108-solib_address.patch # New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435). #=fedoratest -Patch041: gdb-test-pid0-core.patch +Patch040: gdb-test-pid0-core.patch # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp. #=fedoratest -Patch042: gdb-test-dw2-aranges.patch +Patch041: gdb-test-dw2-aranges.patch # Test GDB opcodes/ disassembly of Intel Ivy Bridge instructions (BZ 696890). #=fedoratest -Patch043: gdb-test-ivy-bridge.patch +Patch042: gdb-test-ivy-bridge.patch # Workaround PR libc/14166 for inferior calls of strstr. #=fedoratest: Compatibility with RHELs (unchecked which ones). -Patch044: gdb-glibc-strstr-workaround.patch +Patch043: gdb-glibc-strstr-workaround.patch # Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789). #=fedoratest -Patch045: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch +Patch044: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343). #=fedoratest -Patch046: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch +Patch045: 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 -Patch047: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch +Patch046: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614) #=fedoratest -Patch048: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch +Patch047: 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 -Patch049: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch +Patch048: 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 -Patch050: gdb-rhbz1156192-recursive-dlopen-test.patch +Patch049: gdb-rhbz1156192-recursive-dlopen-test.patch # Fix '`catch syscall' doesn't work for parent after `fork' is called' # (Philippe Waroquiers, RH BZ 1149205). #=fedoratest -Patch051: gdb-rhbz1149205-catch-syscall-after-fork-test.patch +Patch050: 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 -Patch052: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch +Patch051: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch # Test 'info type-printers' Python error (RH BZ 1350436). #=fedoratest -Patch053: gdb-rhbz1350436-type-printers-error.patch +Patch052: gdb-rhbz1350436-type-printers-error.patch # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan # Kratochvil, RH BZ 1084404). #=fedoratest -Patch054: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch +Patch053: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch # Force libncursesw over libncurses to match the includes (RH BZ 1270534). #=push+jan -Patch055: gdb-fedora-libncursesw.patch +Patch054: gdb-fedora-libncursesw.patch # Test clflushopt instruction decode (for RH BZ 1262471). #=fedoratest -Patch056: gdb-opcodes-clflushopt-test.patch +Patch055: gdb-opcodes-clflushopt-test.patch # [aarch64] Fix hardware watchpoints (RH BZ 1261564). #=fedoratest -Patch057: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch +Patch056: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114). #=fedora -Patch058: gdb-container-rh-pkg.patch +Patch057: gdb-container-rh-pkg.patch # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513). #=fedora -Patch059: gdb-linux_perf-bundle.patch +Patch058: gdb-linux_perf-bundle.patch # Fix gdb-headless /usr/bin/ executables (BZ 1390251). # @@ -252,39 +248,39 @@ Patch059: gdb-linux_perf-bundle.patch # # https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot #=fedora -Patch060: gdb-libexec-add-index.patch +Patch059: gdb-libexec-add-index.patch # [s390x] Backport arch12 instructions decoding (RH BZ 1553104). # =fedoratest -Patch061: gdb-rhbz1553104-s390x-arch12-test.patch +Patch060: gdb-rhbz1553104-s390x-arch12-test.patch -Patch062: gdb-backport-readline_support.patch +Patch061: gdb-backport-readline_support.patch # [gdb/testsuite] Use prototype to call libc functions # (Tom de Vries) -Patch063: gdb-backport-fix-break-main-file-remove-fail.patch +Patch062: gdb-backport-fix-break-main-file-remove-fail.patch # Constify target_desc to fix PPC ODR violations. # (Keith Seitz, build/22395) -Patch064: gdb-sw22395-constify-target_desc.patch +Patch063: gdb-sw22395-constify-target_desc.patch # libiberty: Fix C89-isms in configure tests # (Florian Weimer, RHBZ 2143992) -Patch065: gdb-rhbz2143992-libiberty-fix-c89isms-in-configure.patch +Patch064: gdb-rhbz2143992-libiberty-fix-c89isms-in-configure.patch -Patch066: gdb-rhbz2152431-label-symbol-value.patch +Patch065: gdb-rhbz2152431-label-symbol-value.patch #Backport replace deprecated distutils.sysconfig in #python-config (Lancelot SIX) -Patch067: gdb-backport-python-config-replace-deprecated-distutils.patch +Patch066: gdb-backport-python-config-replace-deprecated-distutils.patch # gcc 13 fallout: Backport Jan-Benedict Glaw's fix for the self-move # warning check -Patch068: gdb-gcc-13-backport-self-move-diagnostic-fix +Patch067: gdb-gcc-13-backport-self-move-diagnostic-fix # Backport "call check_typedef at beginning of dwarf_expr_context::fetch_result" # (Simon Marchi, backtrace/29374) -Patch069: gdb-backport-call-check_typedef-at-beginning-of-dwarf_expr_context.patch +Patch068: gdb-backport-call-check_typedef-at-beginning-of-dwarf_expr_context.patch diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include index 4ef8e6c..f004491 100644 --- a/_gdb.spec.patch.include +++ b/_gdb.spec.patch.include @@ -66,4 +66,3 @@ %patch066 -p1 %patch067 -p1 %patch068 -p1 -%patch069 -p1 diff --git a/_patch_order b/_patch_order index 0ff9dda..20b172f 100644 --- a/_patch_order +++ b/_patch_order @@ -25,7 +25,6 @@ gdb-6.5-ia64-libunwind-leak-test.patch gdb-6.5-missed-trap-on-step-test.patch gdb-6.5-gcore-buffer-limit-test.patch gdb-6.3-mapping-zero-inode-test.patch -gdb-6.3-focus-cmd-prev-test.patch gdb-6.8-bz442765-threaded-exec-test.patch gdb-6.5-section-num-fixup-test.patch gdb-6.8-bz466901-backtrace-full-prelinked.patch diff --git a/gdb-6.3-focus-cmd-prev-test.patch b/gdb-6.3-focus-cmd-prev-test.patch deleted file mode 100644 index 27c85f1..0000000 --- a/gdb-6.3-focus-cmd-prev-test.patch +++ /dev/null @@ -1,53 +0,0 @@ -From FEDORA_PATCHES Mon Sep 17 00:00:00 2001 -From: Fedora GDB patches -Date: Fri, 27 Oct 2017 21:07:50 +0200 -Subject: gdb-6.3-focus-cmd-prev-test.patch - -;; Test a crash on `focus cmd', `focus prev' commands. -;;=fedoratest - -diff --git a/gdb/testsuite/gdb.base/focus-cmd-prev.exp b/gdb/testsuite/gdb.base/focus-cmd-prev.exp -new file mode 100644 ---- /dev/null -+++ b/gdb/testsuite/gdb.base/focus-cmd-prev.exp -@@ -0,0 +1,40 @@ -+# Copyright 2008 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. -+ -+if $tracelevel then { -+ strace $tracelevel -+} -+ -+gdb_exit -+gdb_start -+ -+# Do not use gdb_test or \r\n there since: -+# commit d7e747318f4d04af033f16325f9b6d74f67079ec -+# Eliminate make_cleanup_ui_file_delete / make ui_file a class hierarchy -+ -+set test "focus cmd" -+gdb_test_multiple $test $test { -+ -re "$gdb_prompt $" { -+ pass $test -+ } -+} -+ -+set test "focus prev" -+gdb_test_multiple $test $test { -+ -re "$gdb_prompt $" { -+ pass $test -+ } -+}