X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftestsuite%2Fgdb.base%2Fopaque.exp;h=520606c4977116ca750b778eb79e0fae3ed47d81;hb=e439fa140afdaedb28a97acaa2b0432b884d8a91;hp=3e7e0f42c1f9690f1ec9e94c68059764cc2c1e9f;hpb=fa803dc60f0bf01297674c41d001798e18ade4dc;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/testsuite/gdb.base/opaque.exp b/gdb/testsuite/gdb.base/opaque.exp index 3e7e0f42c1..520606c497 100644 --- a/gdb/testsuite/gdb.base/opaque.exp +++ b/gdb/testsuite/gdb.base/opaque.exp @@ -1,47 +1,33 @@ -# Copyright (C) 1992, 1994 Free Software Foundation, Inc. +# Copyright 1992-2017 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 -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -# Please email any bugs, comments, and/or additions to this file to: -# bug-gdb@prep.ai.mit.edu +# along with this program. If not, see . # This file was written by Fred Fish. (fnf@cygnus.com) -if $tracelevel then { - strace $tracelevel -} -set prms_id 0 -set bug_id 0 - -set binfile "opaque" -set srcfile $binfile.c - -if ![file exists $objdir/$subdir/$binfile] then { - perror "$objdir/$subdir/$binfile does not exist." - return 0 +# Create and source the file that provides information about the compiler +# used to compile the test case. +if [get_compiler_info] { + return -1 } -# Start with a fresh gdb. +standard_testfile opaque0.c opaque1.c -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load $objdir/$subdir/$binfile - -source gdb.base/opaque0.ci +if {[prepare_for_testing "failed to prepare" $testfile \ + [list $srcfile $srcfile2] debug]} { + return -1 +} # # Test basic opaque structure handling (statically). @@ -68,10 +54,10 @@ source gdb.base/opaque0.ci proc setup_xfail_on_opaque_pointer {} { global gcc_compiled - setup_xfail "a29k-*-udi" "vax-*-*" "i*86-sequent-bsd*" - if {!$gcc_compiled} then { - setup_xfail "alpha-*-*" "mips-sgi-irix5*" - } + setup_xfail "vax-*-*" "i*86-sequent-bsd*" + if {!$gcc_compiled} then { + setup_xfail "alpha-*-*" + } } # This seems easier than trying to track different versions of xlc; I'm @@ -92,7 +78,7 @@ gdb_test "whatis foop" \ setup_xfail_on_opaque_pointer if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" } gdb_test "ptype foop" \ - "type = struct foo \{\r\n int a;\r\n int b;\r\n\} \[*\]+" \ + "type = struct foo \{\[\r\n\]+ int a;\[\r\n\]+ int b;\[\r\n\]+\} \[*\]+" \ "ptype on opaque struct pointer (statically)" @@ -107,14 +93,14 @@ gdb_test "whatis afoo" \ # Ensure that we know the form of "afoo". gdb_test "ptype afoo" \ - "type = struct foo \{\r\n int a;\r\n int b;\r\n\}" \ + "type = struct foo \{\[\r\n\]+ int a;\[\r\n\]+ int b;\[\r\n\]+\}" \ "ptype on opaque struct instance (statically)" # Ensure that we know what a struct foo looks like. gdb_test "ptype struct foo" \ - "type = struct foo \{\r\n int a;\r\n int b;\r\n\}" \ + "type = struct foo \{\[\r\n\]+ int a;\[\r\n\]+ int b;\[\r\n\]+\}" \ "ptype on opaque struct tagname (statically)" @@ -124,13 +110,8 @@ gdb_test "ptype struct foo" \ # have learned during the static tests. # -if [istarget "mips-idt-*"] then { - # Restart because IDT/SIM runs out of file descriptors. - gdb_exit - gdb_start -} gdb_reinitialize_dir $srcdir/$subdir -gdb_load $objdir/$subdir/$binfile +gdb_load ${binfile} # Run to main, where struct foo is incomplete. if ![runto_main] { @@ -153,7 +134,7 @@ gdb_test "whatis foop" \ setup_xfail_on_opaque_pointer if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" } gdb_test "ptype foop" \ - "type = struct foo \{\r\n int a;\r\n int b;\r\n\} \[*\]+" \ + "type = struct foo \{\[\r\n\]+ int a;\[\r\n\]+ int b;\[\r\n\]+\} \[*\]+" \ "ptype on opaque struct pointer (dynamically) 1" gdb_test "whatis afoo" \ @@ -164,7 +145,7 @@ gdb_test "whatis afoo" \ # Ensure that we know the form of afoo, an instance of a struct foo. gdb_test "ptype afoo" \ - "type = struct foo \{\r\n int a;\r\n int b;\r\n\}" \ + "type = struct foo \{\[\r\n\]+ int a;\[\r\n\]+ int b;\[\r\n\]+\}" \ "ptype on opaque struct instance (dynamically) 1" @@ -172,20 +153,15 @@ gdb_test "ptype afoo" \ if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" } gdb_test "ptype struct foo" \ - "type = struct foo \{\r\n int a;\r\n int b;\r\n\}" \ + "type = struct foo \{\[\r\n\]+ int a;\[\r\n\]+ int b;\[\r\n\]+\}" \ "ptype on opaque struct tagname (dynamically) 1" # Now reload the symbols again so we forget about anything we might # have learned reading the symbols during the previous tests. -if [istarget "mips-idt-*"] then { - # Restart because IDT/SIM runs out of file descriptors. - gdb_exit - gdb_start -} gdb_reinitialize_dir $srcdir/$subdir -gdb_load $objdir/$subdir/$binfile +gdb_load ${binfile} # Run to getfoo, where struct foo is complete. if ![runto getfoo] { @@ -198,15 +174,14 @@ if ![runto getfoo] { setup_xfail_on_opaque_pointer gdb_test "whatis foop" \ "type = struct foo \[*\]+" \ - "whatis on opaque struct pointer (dynamically)" + "whatis on opaque struct pointer (dynamically) 1" # Ensure that we know the form of the thing foop points to. setup_xfail_on_opaque_pointer -if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" } gdb_test "ptype foop" \ - "type = struct foo \{\r\n int a;\r\n int b;\r\n\} \[*\]+" \ + "type = struct foo \{\[\r\n\]+ int a;\[\r\n\]+ int b;\[\r\n\]+\} \[*\]+" \ "ptype on opaque struct pointer (dynamically) 2" gdb_test "whatis afoo" \ @@ -217,12 +192,12 @@ gdb_test "whatis afoo" \ # Ensure that we know the form of afoo, an instance of a struct foo. gdb_test "ptype afoo" \ - "type = struct foo \{\r\n int a;\r\n int b;\r\n\}" \ + "type = struct foo \{\[\r\n\]+ int a;\[\r\n\]+ int b;\[\r\n\]+\}" \ "ptype on opaque struct instance (dynamically) 2" # Ensure that we know the form of an explicit struct foo. gdb_test "ptype struct foo" \ - "type = struct foo \{\r\n int a;\r\n int b;\r\n\}" \ + "type = struct foo \{\[\r\n\]+ int a;\[\r\n\]+ int b;\[\r\n\]+\}" \ "ptype on opaque struct tagname (dynamically) 2"