Blame SOURCES/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch

7bc85d
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
7bc85d
From: Fedora GDB patches <invalid@email.com>
7bc85d
Date: Fri, 27 Oct 2017 21:07:50 +0200
7bc85d
Subject: 
7bc85d
 gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
7bc85d
7bc85d
;; Fix 'gdb gives highly misleading error when debuginfo pkg is present,
7bc85d
;; but not corresponding binary pkg' (RH BZ 981154).
7bc85d
;;=push+jan
7bc85d
7bc85d
Comments by Sergio Durigan Junior <sergiodj@redhat.com>:
7bc85d
7bc85d
  This is the fix for RH BZ #981154
7bc85d
7bc85d
  It is mainly a testcase addition, but a minor fix in the gdb/build-id.c
7bc85d
  file was also needed.
7bc85d
7bc85d
  gdb/build-id.c was added by:
7bc85d
7bc85d
  commit dc294be54c96414035eed7d53dafdea0a6f31a72
7bc85d
  Author: Tom Tromey <tromey@redhat.com>
7bc85d
  Date:   Tue Oct 8 19:56:15 2013 +0000
7bc85d
7bc85d
  and had a little thinko there.  The variable 'filename' needs to be set to
7bc85d
  NULL after it is free'd, otherwise the code below thinks that it is still
7bc85d
  valid and doesn't print the necessary warning ("Try: yum install ...").
7bc85d
7bc85d
diff --git a/gdb/build-id.c b/gdb/build-id.c
7bc85d
--- a/gdb/build-id.c
7bc85d
+++ b/gdb/build-id.c
7bc85d
@@ -581,7 +581,10 @@ build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id,
7bc85d
 	  do_cleanups (inner);
7bc85d
 
7bc85d
 	  if (abfd == NULL)
7bc85d
-	    continue;
7bc85d
+	    {
7bc85d
+	      filename = NULL;
7bc85d
+	      continue;
7bc85d
+	    }
7bc85d
 
7bc85d
 	  if (build_id_verify (abfd.get(), build_id_len, build_id))
7bc85d
 	    break;
7bc85d
diff --git a/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp b/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
7bc85d
new file mode 100644
7bc85d
--- /dev/null
7bc85d
+++ b/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
7bc85d
@@ -0,0 +1,97 @@
7bc85d
+#   Copyright (C) 2014  Free Software Foundation, Inc.
7bc85d
+
7bc85d
+# This program is free software; you can redistribute it and/or modify
7bc85d
+# it under the terms of the GNU General Public License as published by
7bc85d
+# the Free Software Foundation; either version 3 of the License, or
7bc85d
+# (at your option) any later version.
7bc85d
+#
7bc85d
+# This program is distributed in the hope that it will be useful,
7bc85d
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
7bc85d
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
7bc85d
+# GNU General Public License for more details.
7bc85d
+#
7bc85d
+# You should have received a copy of the GNU General Public License
7bc85d
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
7bc85d
+
7bc85d
+standard_testfile "normal.c"
7bc85d
+
7bc85d
+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
7bc85d
+    return -1
7bc85d
+}
7bc85d
+
7bc85d
+# Get the build-id of the file
7bc85d
+set build_id_debug_file [build_id_debug_filename_get $binfile]
7bc85d
+regsub -all ".debug$" $build_id_debug_file "" build_id_without_debug
7bc85d
+
7bc85d
+# Run to main
7bc85d
+if { ![runto_main] } {
7bc85d
+    return -1
7bc85d
+}
7bc85d
+
7bc85d
+# We first need to generate a corefile
7bc85d
+set escapedfilename [string_to_regexp [standard_output_file gcore.test]]
7bc85d
+set core_supported 0
7bc85d
+gdb_test_multiple "gcore [standard_output_file gcore.test]" \
7bc85d
+	"save a corefile" \
7bc85d
+{
7bc85d
+  -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
7bc85d
+    pass "save a corefile"
7bc85d
+    global core_supported
7bc85d
+    set core_supported 1
7bc85d
+  }
7bc85d
+  -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
7bc85d
+    unsupported "save a corefile"
7bc85d
+    global core_supported
7bc85d
+    set core_supported 0
7bc85d
+  }
7bc85d
+}
7bc85d
+
7bc85d
+if {!$core_supported} {
7bc85d
+  return -1
7bc85d
+}
7bc85d
+
7bc85d
+# Move the binfile to a temporary name
7bc85d
+remote_exec build "mv $binfile ${binfile}.old"
7bc85d
+
7bc85d
+# Reinitialize GDB and see if we get a yum/dnf warning
7bc85d
+gdb_exit
7bc85d
+gdb_start
7bc85d
+gdb_reinitialize_dir $srcdir/$subdir
7bc85d
+
7bc85d
+with_test_prefix "first run:" {
7bc85d
+    gdb_test "set build-id-verbose 1" "" \
7bc85d
+	"set build-id-verbose"
7bc85d
+
7bc85d
+    gdb_test "set debug-file-directory [file dirname [standard_output_file gcore.test]]" "" \
7bc85d
+	"set debug-file-directory"
7bc85d
+
7bc85d
+    gdb_test "core-file [standard_output_file gcore.test]" \
7bc85d
+	"Missing separate debuginfo for the main executable file\r\nTry: (yum|dnf) --enablerepo='\\*debug\\*' install [standard_output_file $build_id_without_debug]\r\n.*" \
7bc85d
+	"test first yum/dnf warning"
7bc85d
+}
7bc85d
+
7bc85d
+# Now we define and create our .build-id
7bc85d
+file mkdir [file dirname [standard_output_file ${build_id_without_debug}]]
7bc85d
+# Cannot use "file link" (from TCL) because it requires the target file to
7bc85d
+# exist.
7bc85d
+remote_exec build "ln -s $binfile [standard_output_file ${build_id_without_debug}]"
7bc85d
+
7bc85d
+# Reinitialize GDB to get the second yum/dnf warning
7bc85d
+gdb_exit
7bc85d
+gdb_start
7bc85d
+gdb_reinitialize_dir $srcdir/$subdir
7bc85d
+
7bc85d
+with_test_prefix "second run:" {
7bc85d
+    gdb_test "set build-id-verbose 1" "" \
7bc85d
+	"set build-id-verbose"
7bc85d
+
7bc85d
+    gdb_test "set debug-file-directory [file dirname [standard_output_file gcore.test]]" "" \
7bc85d
+	"set debug-file-directory"
7bc85d
+
7bc85d
+    gdb_test "core-file [standard_output_file gcore.test]" \
7bc85d
+	"Missing separate debuginfo for the main executable file\r\nTry: (yum|dnf) --enablerepo='\\*debug\\*' install $binfile\r\n.*" \
7bc85d
+	"test second yum/dnf warning"
7bc85d
+}
7bc85d
+
7bc85d
+# Leaving the link there will cause breakage in the next run.
7bc85d
+remote_exec build "rm -f [standard_output_file ${build_id_without_debug}]"