rpms/gdb/devel gdb-testsuite-lineno.patch, NONE, 1.1 .cvsignore, 1.44, 1.45 gdb.spec, 1.392, 1.393 sources, 1.43, 1.44 gdb-tracepoint-warning.patch, 1.1, NONE libstdc++-v3-python-common-prefix.patch, 1.1, NONE

Jan Kratochvil jkratoch at fedoraproject.org
Mon Jan 18 23:22:43 UTC 2010


Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32285

Modified Files:
	.cvsignore gdb.spec sources 
Added Files:
	gdb-testsuite-lineno.patch 
Removed Files:
	gdb-tracepoint-warning.patch 
	libstdc++-v3-python-common-prefix.patch 
Log Message:
* Tue Jan 19 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0.50.20100118-1.fc13
- Upgrade to the FSF GDB snapshot: 7.0.50.20100118
- Upgrade libstdc++-v3-python to r155978 (Phil Muldoon).


gdb-testsuite-lineno.patch:
 mi-break.exp |    5 ++++-
 mi-cli.exp   |   15 +++++++++------
 mi2-cli.exp  |   12 +++++++-----
 3 files changed, 20 insertions(+), 12 deletions(-)

--- NEW FILE gdb-testsuite-lineno.patch ---
http://sourceware.org/ml/gdb-patches/2010-01/msg00461.html
Subject: [patch] testsuite: Fix misplaced line numbers

Hi,

commit 7a82dfb2a9be66f0230229642cbee54ebda3b0da
Author: Joel Brobecker <brobecker at gnat.com>
Date:   Fri Jan 1 07:31:28 2010 +0000

    Update copyright year in most headers.
    
    Automatic update by copyright.sh.

regressed:

-PASS: gdb.mi/mi-break.exp: run to breakpoint with ignore count
+FAIL: gdb.mi/mi-break.exp: run to breakpoint with ignore count (stopped at wrong place)
-PASS: gdb.mi/mi-cli.exp: continue to callee4
+FAIL: gdb.mi/mi-cli.exp: continue to callee4 (stopped at wrong place)
-PASS: gdb.mi/mi-cli.exp: check *stopped from CLI command
+FAIL: gdb.mi/mi-cli.exp: check *stopped from CLI command (stopped at wrong place)
-PASS: gdb.mi/mi2-cli.exp: continue to callee4
+FAIL: gdb.mi/mi2-cli.exp: continue to callee4 (stopped at wrong place)

due to:

#--- a/gdb/testsuite/gdb.mi/basics.c
#+++ b/gdb/testsuite/gdb.mi/basics.c
#@@ -1,4 +1,5 @@
#-/* Copyright 1999, 2000, 2004, 2007, 2008, 2009 Free Software Foundation, Inc.
#+/* Copyright 1999, 2000, 2004, 2007, 2008, 2009, 2010
#+Free Software Foundation, Inc.


Tested on x86_64-fedora12-linux-gnu.


Thanks,
Jan


2010-01-18  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* gdb.mi/mi-break.exp (set line_callme_head, set line_callme_body): New.
	(test_ignore_count): Declare line_callme_body global.
	(run to breakpoint with ignore count): Use line_callme_body.
	* gdb.mi/mi-cli.exp (set line_main_head, set line_main_body)
	(set line_main_hello, set line_main_return): Reindent.
	(set line_callee4_head, set line_callee4_body, set line_callee4_next):
	New.
	(continue to callee4): Use line_callee4_body.
	(check *stopped from CLI command): Use line_callee4_next.
	* gdb.mi/mi2-cli.exp (set line_main_head, set line_main_body)
	(set line_main_hello, set line_main_return): Reindent.
	(set line_callee4_head, set line_callee4_body): New.
	(continue to callee4): Use line_callee4_body.

--- a/gdb/testsuite/gdb.mi/mi-break.exp
+++ b/gdb/testsuite/gdb.mi/mi-break.exp
@@ -56,6 +56,8 @@ set line_callee1_head  [gdb_get_line_number "callee1 ("]
 set line_callee1_body  [expr $line_callee1_head + 2]
 set line_main_head     [gdb_get_line_number "main ("]
 set line_main_body     [expr $line_main_head + 2]
+set line_callme_head   [gdb_get_line_number "callme ("]
+set line_callme_body   [expr $line_callme_head + 2]
 
 set fullname "fullname=\"${fullname_syntax}${srcfile}\""
 
@@ -152,6 +154,7 @@ proc test_rbreak_creation_and_listing {} {
 
 proc test_ignore_count {} {
     global mi_gdb_prompt
+    global line_callme_body
 
     mi_gdb_test "-break-insert -i 1 callme" \
         "\\^done.*ignore=\"1\".*" \
@@ -159,7 +162,7 @@ proc test_ignore_count {} {
 
     mi_run_cmd
 
-    mi_expect_stop "breakpoint-hit" "callme" "\{name=\"i\",value=\"2\"\}" ".*basics.c" "52" \
+    mi_expect_stop "breakpoint-hit" "callme" "\{name=\"i\",value=\"2\"\}" ".*basics.c" $line_callme_body \
         {"" "disp=\"keep\"" } "run to breakpoint with ignore count"
 }
 
--- a/gdb/testsuite/gdb.mi/mi-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-cli.exp
@@ -63,10 +63,13 @@ mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
 
 mi_run_to_main
 
-set line_main_head   [gdb_get_line_number "main ("]
-set line_main_body   [expr $line_main_head + 2]
-set line_main_hello  [gdb_get_line_number "Hello, World!"]
-set line_main_return [expr $line_main_hello + 2]
+set line_main_head    [gdb_get_line_number "main ("]
+set line_main_body    [expr $line_main_head + 2]
+set line_main_hello   [gdb_get_line_number "Hello, World!"]
+set line_main_return  [expr $line_main_hello + 2]
+set line_callee4_head [gdb_get_line_number "callee4 ("]
+set line_callee4_body [expr $line_callee4_head + 2]
+set line_callee4_next [expr $line_callee4_body + 1]
 
 mi_gdb_test "-interpreter-exec console \"set args foobar\"" \
   {\^done} \
@@ -97,7 +100,7 @@ mi_gdb_test "-interpreter-exec console \"list\"" \
   ".*\~\"$line_main_body\[\\\\t \]*callee1.*;\\\\n\".*\\^done" \
   "-interpreter-exec console \"list\""
 
-mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "28" \
+mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" $line_callee4_body \
     { "" "disp=\"keep\"" } "continue to callee4"
 
 # NOTE: cagney/2003-02-03: Not yet.
@@ -155,7 +158,7 @@ if {$async} {
     set reason ""
 }
 
-mi_execute_to "interpreter-exec console step" $reason "callee4" "" ".*basics.c" "29" \
+mi_execute_to "interpreter-exec console step" $reason "callee4" "" ".*basics.c" $line_callee4_next \
     "" "check *stopped from CLI command"
 
 # NOTE: cagney/2003-02-03: Not yet.
--- a/gdb/testsuite/gdb.mi/mi2-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi2-cli.exp
@@ -63,10 +63,12 @@ mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
 
 mi_run_to_main
 
-set line_main_head   [gdb_get_line_number "main ("]
-set line_main_body   [expr $line_main_head + 2]
-set line_main_hello  [gdb_get_line_number "Hello, World!"]
-set line_main_return [expr $line_main_hello + 2]
+set line_main_head    [gdb_get_line_number "main ("]
+set line_main_body    [expr $line_main_head + 2]
+set line_main_hello   [gdb_get_line_number "Hello, World!"]
+set line_main_return  [expr $line_main_hello + 2]
+set line_callee4_head [gdb_get_line_number "callee4 ("]
+set line_callee4_body [expr $line_callee4_head + 2]
 
 mi_gdb_test "-interpreter-exec console \"set args foobar\"" \
   {\^done} \
@@ -97,7 +100,7 @@ mi_gdb_test "-interpreter-exec console \"list\"" \
   ".*\~\"$line_main_body\[\\\\t \]*callee1.*;\\\\n\".*\\^done" \
   "-interpreter-exec console \"list\""
 
-mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" "28" \
+mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" $line_callee4_body \
     { "" "disp=\"keep\"" } \
     "continue to callee4"
 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	16 Jan 2010 22:32:05 -0000	1.44
+++ .cvsignore	18 Jan 2010 23:22:41 -0000	1.45
@@ -1,2 +1,2 @@
-gdb-7.0.50.20100116.tar.bz2
-libstdc++-v3-python-r151798.tar.bz2
+gdb-7.0.50.20100118.tar.bz2
+libstdc++-v3-python-r155978.tar.bz2


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -p -r1.392 -r1.393
--- gdb.spec	16 Jan 2010 22:32:10 -0000	1.392
+++ gdb.spec	18 Jan 2010 23:22:41 -0000	1.393
@@ -32,7 +32,7 @@ Name: gdb%{?_with_debug:-debug}
 # Set version to contents of gdb/version.in.
 # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3
 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch).
-Version: 7.0.50.20100116
+Version: 7.0.50.20100118
 
 # 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.
@@ -81,7 +81,7 @@ Source2: gdb-orphanripper.c
 Source3: gdb-gstack.man
 
 # libstdc++ pretty printers from GCC SVN HEAD (4.5 experimental).
-%define libstdcxxpython libstdc++-v3-python-r151798
+%define libstdcxxpython libstdc++-v3-python-r155978
 Source4: %{libstdcxxpython}.tar.bz2
 
 # Work around out-of-date dejagnu that does not have KFAIL
@@ -378,9 +378,6 @@ Patch349: gdb-archer.patch
 # - Turn on 64-bit BFD support, globally enable AC_SYS_LARGEFILE.
 Patch360: gdb-6.8-bz457187-largefile-test.patch
 
-# Fix python pretty printers lookup on x86_64.
-Patch376: libstdc++-v3-python-common-prefix.patch
-
 # New test for step-resume breakpoint placed in multiple threads at once.
 Patch381: gdb-simultaneous-step-resume-breakpoint-test.patch
 
@@ -431,8 +428,8 @@ Patch407: gdb-lineno-makeup-test.patch
 # Test power7 ppc disassembly.
 Patch408: gdb-ppc-power7-test.patch
 
-# Fix tracepoint.c compilation warnings.
-Patch409: gdb-tracepoint-warning.patch
+# [patch] testsuite: Fix misplaced line numbers
+Patch410: gdb-testsuite-lineno.patch
 
 BuildRequires: ncurses-devel%{?_isa} texinfo gettext flex bison expat-devel%{?_isa}
 Requires: readline%{?_isa}
@@ -662,7 +659,6 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch343 -p1
 %patch348 -p1
 %patch360 -p1
-%patch376 -p1
 %patch381 -p1
 %patch382 -p1
 %patch387 -p1
@@ -680,7 +676,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch406 -p1
 %patch407 -p1
 %patch408 -p1
-%patch409 -p1
+%patch410 -p1
 # Always verify its applicability.
 %patch393 -p1
 %patch335 -p1
@@ -1006,6 +1002,10 @@ fi
 %endif
 
 %changelog
+* Tue Jan 19 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0.50.20100118-1.fc13
+- Upgrade to the FSF GDB snapshot: 7.0.50.20100118
+- Upgrade libstdc++-v3-python to r155978 (Phil Muldoon).
+
 * Sat Jan 16 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0.50.20100116-1.fc13
 - Upgrade to the FSF GDB snapshot: 7.0.50.20100116
 - archer-jankratochvil-fedora13 commit: 81810a20b2d2c3bf18e151de3cddfc96445b3c46


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	16 Jan 2010 22:32:10 -0000	1.43
+++ sources	18 Jan 2010 23:22:41 -0000	1.44
@@ -1,2 +1,2 @@
-446db9ed2489ab9984f67923a51b74a9  gdb-7.0.50.20100116.tar.bz2
-7507540c50a1edeb2fc22a37bc4a08b8  libstdc++-v3-python-r151798.tar.bz2
+2fb1a2ac78b3bdc495bbabd85e310a5d  gdb-7.0.50.20100118.tar.bz2
+04e5c4b1b9e633422cc48990fe61958d  libstdc++-v3-python-r155978.tar.bz2


--- gdb-tracepoint-warning.patch DELETED ---


--- libstdc++-v3-python-common-prefix.patch DELETED ---



More information about the scm-commits mailing list