151 lines
5.0 KiB
Diff
151 lines
5.0 KiB
Diff
From: Jan Kratochvil <jan.kratochvil@redhat.com>
|
|
Date: Fri, 27 Oct 2017 21:07:50 +0200
|
|
Subject: gdb-6.6-bz235197-fork-detach-info.patch
|
|
|
|
FileName: gdb-6.6-bz235197-fork-detach-info.patch
|
|
|
|
|
|
2008-03-01 Jan Kratochvil <jan.kratochvil@redhat.com>
|
|
|
|
Port to GDB-6.8pre.
|
|
Remove the `[' character from the GDB-6.8 default message.
|
|
|
|
Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/fork-detach.c
|
|
===================================================================
|
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/fork-detach.c 2016-02-15 23:25:36.686600598 +0100
|
|
@@ -0,0 +1,57 @@
|
|
+/* This testcase is part of GDB, the GNU debugger.
|
|
+
|
|
+ Copyright 2007 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.
|
|
+
|
|
+ Please email any bugs, comments, and/or additions to this file to:
|
|
+ bug-gdb@prep.ai.mit.edu */
|
|
+
|
|
+#include <sys/types.h>
|
|
+#include <sys/wait.h>
|
|
+#include <unistd.h>
|
|
+#include <assert.h>
|
|
+#include <stdlib.h>
|
|
+
|
|
+static void func (void)
|
|
+{
|
|
+}
|
|
+
|
|
+int main (void)
|
|
+{
|
|
+ pid_t child;
|
|
+
|
|
+ child = fork ();
|
|
+ switch (child)
|
|
+ {
|
|
+ case -1:
|
|
+ abort ();
|
|
+ case 0:
|
|
+ func ();
|
|
+ break;
|
|
+ default:
|
|
+ {
|
|
+/* We do not test the switching to the other fork by GDB `fork 1'. */
|
|
+#if 0
|
|
+ pid_t got;
|
|
+
|
|
+ got = waitpid (child, NULL, 0);
|
|
+ assert (got == child);
|
|
+#endif
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/fork-detach.exp
|
|
===================================================================
|
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/fork-detach.exp 2016-02-15 23:27:55.792588265 +0100
|
|
@@ -0,0 +1,36 @@
|
|
+# Copyright 2007 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.
|
|
+
|
|
+set testfile fork-detach
|
|
+set srcfile ${testfile}.c
|
|
+set binfile [standard_output_file ${testfile}]
|
|
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
|
|
+ untested "Couldn't compile test program"
|
|
+ return -1
|
|
+}
|
|
+
|
|
+# Get things started.
|
|
+
|
|
+gdb_exit
|
|
+gdb_start
|
|
+gdb_reinitialize_dir $srcdir/$subdir
|
|
+gdb_load ${binfile}
|
|
+
|
|
+gdb_run_cmd
|
|
+# `Starting program: .*' prefix is available since gdb-6.7.
|
|
+gdb_test "" \
|
|
+ "Detaching after fork from child process.*\\\[Inferior .* exited normally\\\]" \
|
|
+ "Info message caught"
|
|
Index: gdb-7.10.90.20160211/gdb/infrun.c
|
|
===================================================================
|
|
--- gdb-7.10.90.20160211.orig/gdb/infrun.c 2016-02-15 23:25:01.432350289 +0100
|
|
+++ gdb-7.10.90.20160211/gdb/infrun.c 2016-02-15 23:27:49.274541986 +0100
|
|
@@ -478,7 +478,7 @@
|
|
remove_breakpoints_pid (ptid_get_pid (inferior_ptid));
|
|
}
|
|
|
|
- if (info_verbose || debug_infrun)
|
|
+ if (1 /* Fedora Bug 235197 */ || info_verbose || debug_infrun)
|
|
{
|
|
/* Ensure that we have a process ptid. */
|
|
ptid_t process_ptid = pid_to_ptid (ptid_get_pid (child_ptid));
|
|
Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/catch-syscall.exp
|
|
===================================================================
|
|
--- gdb-7.10.90.20160211.orig/gdb/testsuite/gdb.base/catch-syscall.exp 2016-02-15 23:25:01.432350289 +0100
|
|
+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/catch-syscall.exp 2016-02-15 23:25:36.689600619 +0100
|
|
@@ -165,7 +165,7 @@
|
|
# Deleting the catchpoints
|
|
delete_breakpoints
|
|
|
|
- gdb_continue_to_end
|
|
+ gdb_continue_to_end "" continue 1
|
|
}
|
|
|
|
proc test_catch_syscall_without_args {} {
|
|
@@ -236,7 +236,7 @@
|
|
# If it doesn't, everything is right (since we don't have
|
|
# a syscall named "mlock" in it). Otherwise, this is a failure.
|
|
set thistest "catch syscall with unused syscall ($syscall_name)"
|
|
- gdb_continue_to_end $thistest
|
|
+ gdb_continue_to_end $thistest continue 1
|
|
}
|
|
}
|
|
|