From 0a42762f26f5fa905ba98cc55b64b0cd39df4ddf Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@redhat.com>
Date: Mon, 5 May 2014 18:44:10 -0300
Subject: [PATCH] * Mon May  5 2014 Sergio Durigan Junior <sergiodj@redhat.com>
 - 7.7-9.fc21 - Improve testcase message for RH BZ 981154.

---
 ...warning-missing-debuginfo-rhbz981154.patch | 34 +++++++++++--------
 gdb.spec                                      |  5 ++-
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch b/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
index b7c47e3..044a408 100644
--- a/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+++ b/gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
@@ -19,7 +19,7 @@ Index: gdb-7.7/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.
 ===================================================================
 --- /dev/null
 +++ gdb-7.7/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
-@@ -0,0 +1,93 @@
+@@ -0,0 +1,97 @@
 +#   Copyright (C) 2014  Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -80,15 +80,17 @@ Index: gdb-7.7/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.
 +gdb_start
 +gdb_reinitialize_dir $srcdir/$subdir
 +
-+gdb_test "set build-id-verbose 1" "" \
-+    "set build-id-verbose"
++with_test_prefix "first run:" {
++    gdb_test "set build-id-verbose 1" "" \
++	"set build-id-verbose"
 +
-+gdb_test "set debug-file-directory ${objdir}/${subdir}" "" \
-+    "set debug-file-directory to ${objdir}/${subdir}"
++    gdb_test "set debug-file-directory ${objdir}/${subdir}" "" \
++	"set debug-file-directory"
 +
-+gdb_test "core-file ${objdir}/${subdir}/gcore.test" \
-+    "Missing separate debuginfo for the main executable file\r\nTry: yum --enablerepo='\\*debug\\*' install $objdir/$subdir/$build_id_without_debug\r\n.*" \
-+    "test first yum warning to install $objdir/$subdir/$build_id_without_debug"
++    gdb_test "core-file ${objdir}/${subdir}/gcore.test" \
++	"Missing separate debuginfo for the main executable file\r\nTry: yum --enablerepo='\\*debug\\*' install $objdir/$subdir/$build_id_without_debug\r\n.*" \
++	"test first yum warning"
++}
 +
 +# Now we define and create our .build-id
 +file mkdir [file dirname ${objdir}/${subdir}/${build_id_without_debug}]
@@ -101,15 +103,17 @@ Index: gdb-7.7/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.
 +gdb_start
 +gdb_reinitialize_dir $srcdir/$subdir
 +
-+gdb_test "set build-id-verbose 1" "" \
-+    "set build-id-verbose"
++with_test_prefix "second run:" {
++    gdb_test "set build-id-verbose 1" "" \
++	"set build-id-verbose"
 +
-+gdb_test "set debug-file-directory ${objdir}/${subdir}" "" \
-+    "set debug-file-directory to ${objdir}/${subdir}"
++    gdb_test "set debug-file-directory ${objdir}/${subdir}" "" \
++	"set debug-file-directory"
 +
-+gdb_test "core-file ${objdir}/${subdir}/gcore.test" \
-+    "Missing separate debuginfo for the main executable file\r\nTry: yum --enablerepo='\\*debug\\*' install $binfile\r\n.*" \
-+    "test second yum warning to install $binfile"
++    gdb_test "core-file ${objdir}/${subdir}/gcore.test" \
++	"Missing separate debuginfo for the main executable file\r\nTry: yum --enablerepo='\\*debug\\*' install $binfile\r\n.*" \
++	"test second yum warning"
++}
 +
 +# Leaving the link there will cause breakage in the next run.
 +remote_exec build "rm -f ${objdir}/${subdir}/${build_id_without_debug}"
diff --git a/gdb.spec b/gdb.spec
index 6ae8c63..6d27e79 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -39,7 +39,7 @@ Version: 7.7
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL
 Group: Development/Debuggers
@@ -1382,6 +1382,9 @@ fi
 %endif # 0%{!?el5:1} || "%{_target_cpu}" == "noarch"
 
 %changelog
+* Mon May  5 2014 Sergio Durigan Junior <sergiodj@redhat.com> - 7.7-9.fc21
+- Improve testcase message for RH BZ 981154.
+
 * Mon May  5 2014 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.7-8.fc21
 - Fix TLS access for -static -pthread (BZ 1080660).