X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftestsuite%2Fgdb.cp%2Fnsusing.exp;h=756ef5005cf632fb9fc187c2cb8d84deecd71ca8;hb=0e7a53fca6e4e7bb37f045895df6a855fb2f451e;hp=b060ee20f8c423ac22a1e71c5a02b7b40af2ff4f;hpb=13387711b26dfd93e5b00e529df30f0132ec38fd;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/testsuite/gdb.cp/nsusing.exp b/gdb/testsuite/gdb.cp/nsusing.exp
index b060ee20f8..756ef5005c 100644
--- a/gdb/testsuite/gdb.cp/nsusing.exp
+++ b/gdb/testsuite/gdb.cp/nsusing.exp
@@ -1,4 +1,4 @@
-# Copyright 2008, 2010 Free Software Foundation, Inc.
+# Copyright 2008-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,34 +13,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if $tracelevel then {
-    strace $tracelevel
-}
 
-set prms_id 0
-set bug_id 0
+standard_testfile .cc
 
-set testfile nsusing
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
-      {debug c++}] != "" } {
-    untested "Couldn't compile test program"
+if [get_compiler_info] {
     return -1
 }
 
-if [get_compiler_info ${binfile}] {
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
     return -1
 }
 
-
-# Get things started.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 ############################################
 # test printing of namespace imported within
 # the function.
@@ -206,5 +189,10 @@ if ![runto_main] then {
 gdb_breakpoint [gdb_get_line_number "marker10 stop"]
 gdb_continue_to_breakpoint "marker10 stop"
 
+if { [test_compiler_info {gcc-[0-3]-*}] ||
+     [test_compiler_info {gcc-4-[0-3]-*}]} {
+    setup_xfail *-*-* 
+}
+
 # Assert that M::x is printed and not N::x
 gdb_test "print x" "= 911" "print x (from M::x)"