[SCM] archer: Merge commit 'origin/archer-jankratochvil-misc' into archer

[jkratoch@sourceware.org]

The branch, archer has been updated
       via  f7395c26d5216c414498cbca9be5cc1b699ae635 (commit)
       via  faf81bd1827c1405b4f5218bfbe75f98d6de1cb5 (commit)
       via  81eb33a072e71058d691fcf884f1b2d0966b3ec6 (commit)
       via  6a1955b849f21abaa7de93dc4f65cab16f348a45 (commit)
      from  c426803f90bd1e42536ac9b908ad2d3c7075adc0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit f7395c26d5216c414498cbca9be5cc1b699ae635
Merge: 81eb33a072e71058d691fcf884f1b2d0966b3ec6 faf81bd1827c1405b4f5218bfbe75f98d6de1cb5
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Mar 13 16:36:07 2009 +0100

    Merge commit 'origin/archer-jankratochvil-misc' into archer

commit 81eb33a072e71058d691fcf884f1b2d0966b3ec6
Merge: c426803f90bd1e42536ac9b908ad2d3c7075adc0 6a1955b849f21abaa7de93dc4f65cab16f348a45
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Mar 13 16:24:51 2009 +0100

    Merge commit 'origin/archer-jankratochvil-misc' into archer

-----------------------------------------------------------------------

Summary of changes:
 gdb/testsuite/gdb.base/multi-forks.exp |    4 ++++
 gdb/testsuite/gdb.cp/expand-sals.exp   |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

First 500 lines of diff:
diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp
index ac56fb0..70c1a20 100644
--- a/gdb/testsuite/gdb.base/multi-forks.exp
+++ b/gdb/testsuite/gdb.base/multi-forks.exp
@@ -66,6 +66,10 @@ global gdb_prompt
 # The result should be that each of the 4 forks returns zero.
 
 runto_main
+
+gdb_test "call close (1)" "= 0" \
+	 "Suppress the inferior output mixing with GDB output"
+
 set exit_bp_loc [gdb_get_line_number "Set exit breakpoint here."]
 gdb_test "break $exit_bp_loc" "Breakpoint.* at .*" "Break at exit"
 gdb_test "set follow child" "" ""
diff --git a/gdb/testsuite/gdb.cp/expand-sals.exp b/gdb/testsuite/gdb.cp/expand-sals.exp
index a2631fb..6e04cbf 100644
--- a/gdb/testsuite/gdb.cp/expand-sals.exp
+++ b/gdb/testsuite/gdb.cp/expand-sals.exp
@@ -77,7 +77,7 @@ gdb_continue_to_breakpoint "caller" ".*caller-line.*"
 
 # Test GDB caught this return call and not the next one through B::B()
 gdb_test "bt" \
-	 "#0 \[^\r\n\]* A \[^\r\n\]*\r\n#1 \[^\r\n\]* main \[^\r\n\]*" \
+	 "#0 \[^\r\n\]* (A::)?A \[^\r\n\]*\r\n#1 \[^\r\n\]* main \[^\r\n\]*" \
 	 "bt from A"
 
 gdb_continue_to_breakpoint "next caller instance" ".*caller-line.*"
@@ -89,7 +89,7 @@ gdb_continue_to_breakpoint "next caller instance" ".*caller-line.*"
 # case, expecting here to catch the breakpoint before the call happens.
 
 gdb_test "bt" \
-	 "#0 \[^\r\n\]* A \[^\r\n\]*\r\n#1 \[^\r\n\]* B \[^\r\n\]*\r\n#2 \[^\r\n\]* main \[^\r\n\]*" \
+	 "#0 \[^\r\n\]* (A::)?A \[^\r\n\]*\r\n#1 \[^\r\n\]* (B::)?B \[^\r\n\]*\r\n#2 \[^\r\n\]* main \[^\r\n\]*" \
 	 "bt from B before the call"
 
 gdb_continue_to_breakpoint "next caller func" ".*func-line.*"


hooks/post-receive
--
Repository for Project Archer.