| Index: gdb/testsuite/gdb.cp/parse-lang.exp | 
| diff --git a/gdb/testsuite/gdb.cp/namespace-nested-import.exp b/gdb/testsuite/gdb.cp/parse-lang.exp | 
| similarity index 68% | 
| copy from gdb/testsuite/gdb.cp/namespace-nested-import.exp | 
| copy to gdb/testsuite/gdb.cp/parse-lang.exp | 
| index 24507ce8d11603732fc1c7e5851ca435aae159b9..c0051e9fc1c72997a91fc228c4037adb3da39a94 100644 | 
| --- a/gdb/testsuite/gdb.cp/namespace-nested-import.exp | 
| +++ b/gdb/testsuite/gdb.cp/parse-lang.exp | 
| @@ -1,4 +1,4 @@ | 
| -# Copyright 2008, 2010-2012 Free Software Foundation, Inc. | 
| +# Copyright 2012-2013 Free Software Foundation, Inc. | 
|  | 
| # This program is free software; you can redistribute it and/or modify | 
| # it under the terms of the GNU General Public License as published by | 
| @@ -13,21 +13,19 @@ | 
| # You should have received a copy of the GNU General Public License | 
| # along with this program.  If not, see <http://www.gnu.org/licenses/>. | 
|  | 
| - | 
| standard_testfile .cc | 
|  | 
| if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { | 
| return -1 | 
| } | 
|  | 
| -############################################ | 
| -# Test printing of a variable from a nested | 
| -# in a namespace inner to the one which has | 
| -# been imported. | 
| +# Place the breakpoint before inferior gets started.  Then the breakpoint | 
| +# condition will be re-evaluated in non-C++ startup code. | 
| +gdb_breakpoint "C::m if v == 42" | 
|  | 
| -if ![runto_main] then { | 
| -    perror "couldn't run to breakpoint main" | 
| -    continue | 
| -} | 
| +gdb_breakpoint "marker" | 
| + | 
| +# runto_main would delete the breakpoint. | 
| +gdb_run_cmd | 
|  | 
| -gdb_test "print C::x" "= 5" | 
| +gdb_test "" {Breakpoint [0-9]+, C::m .*} "breakpoint hit" | 
|  |