rpms/gdb/devel gdb-upstream.patch,NONE,1.1 gdb.spec,1.401,1.402

[Jan Kratochvil]

Author: jkratoch

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

Modified Files:
	gdb.spec 
Added Files:
	gdb-upstream.patch 
Log Message:
* Sun Jan 24 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0.50.20100121-8.fc13
- testsuite: Fix gdb.arch/i386-bp_permanent.exp regression


gdb-upstream.patch:
 i386-bp_permanent.exp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gdb-upstream.patch ---
[obv] testsuite: Fix gdb.arch/i386-bp_permanent.exp regression
http://sourceware.org/ml/gdb-patches/2010-01/msg00554.html
http://sourceware.org/ml/gdb-cvs/2010-01/msg00203.html

### src/gdb/testsuite/ChangeLog	2010/01/22 17:06:49	1.2099
### src/gdb/testsuite/ChangeLog	2010/01/24 04:29:32	1.2100
## -1,3 +1,8 @@
+2010-01-24  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* gdb.arch/i386-bp_permanent.exp (Disassemble function '$function'):
+	Adjust it for DISASSEMBLY_OMIT_FNAME.
+
 2010-01-22  Jan Kratochvil  <jan.kratochvil at redhat.com>
 
 	PR symtab/11199:
--- src/gdb/testsuite/gdb.arch/i386-bp_permanent.exp	2010/01/01 07:32:00	1.3
+++ src/gdb/testsuite/gdb.arch/i386-bp_permanent.exp	2010/01/24 04:29:32	1.4
@@ -62,7 +62,7 @@
 set function standard
 
 set retcode [gdb_test_multiple "disassemble $function" "Disassemble function '$function'" {
-    -re ".*($hex) <$function\\+0>.*($hex) <$function\\+4>.*($hex) <$function\\+5>.*($hex) <$function\\+6>.*$gdb_prompt $" {
+    -re ".*($hex) <\\+0>.*($hex) <\\+4>.*($hex) <\\+5>.*($hex) <\\+6>.*$gdb_prompt $" {
       set function_start $expect_out(1,string);
       set address $expect_out(2,string);
       set address1 $expect_out(3,string);


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -p -r1.401 -r1.402
--- gdb.spec	24 Jan 2010 03:56:31 -0000	1.401
+++ gdb.spec	24 Jan 2010 04:38:20 -0000	1.402
@@ -36,7 +36,7 @@ Version: 7.0.50.20100121
 
 # 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: 7%{?_with_upstream:.upstream}%{dist}
+Release: 8%{?_with_upstream:.upstream}%{dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -242,7 +242,7 @@ Patch229: gdb-6.3-bz140532-ppc-unwinding
 Patch231: gdb-6.3-bz202689-exec-from-pthread-test.patch
 
 # Backported fixups post the source tarball.
-#Patch232: gdb-upstream.patch
+Patch232: gdb-upstream.patch
 
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 Patch234: gdb-6.6-bz230000-power6-disassembly-test.patch
@@ -572,7 +572,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 
 %if 0%{!?_with_upstream:1}
 
-#patch232 -p1
+%patch232 -p1
 %patch349 -p1
 %patch124 -p1
 %patch1 -p1
@@ -1018,6 +1018,9 @@ fi
 %endif
 
 %changelog
+* Sun Jan 24 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0.50.20100121-8.fc13
+- testsuite: Fix gdb.arch/i386-bp_permanent.exp regression
+
 * Sun Jan 24 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0.50.20100121-7.fc13
 - Update gdb.arch/powerpc-power7.exp for current binutils HEAD.