diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 15 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/annota1.exp | 22 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/long_long.exp | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/maint.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.c++/ctti.exp | 3 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.c++/namespace.exp | 3 |
6 files changed, 37 insertions, 16 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 497d5ca..ba4ae40 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,18 @@ +Thu Mar 8 16:06:00 2001 David Taylor <taylor@redhat.com> + + * gdb.base/annota1.exp: Move test of isnative to earlier in the + file -- to prevent failing when the compile fails but we have no + intention of running the tests anyway. + + * gdb.base/long_long.exp: Test target_info for no_long_long, skip + tests if set. + + * gdb.base/maint.exp: Support 2 byte integers as well as 4 byte + integers. + + * gdb.c++/ctti.exp: Skip tests if skip_cplus_tests returns true. + * gdb.c++/namespace.exp: Ditto. + 2001-03-07 Orjan Friberg <orjanf@axis.com> * gdb.base/pointers.c: Don't assume doubles are >= 8 bytes. diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp index 370f5b2..4848c67 100644 --- a/gdb/testsuite/gdb.base/annota1.exp +++ b/gdb/testsuite/gdb.base/annota1.exp @@ -1,4 +1,4 @@ -# Copyright 1999, 2000 +# Copyright 1999, 2000, 2001 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -25,6 +25,16 @@ if $tracelevel then { } +# are we on a target board? If so, don't run these tests. +# note: this is necessary because we cannot use runto_main (which would +# work for remote targets too) because of the different prompt we get +# when using annotation level 2. +# +if ![isnative] then { + return 0 +} + + # # test running programs # @@ -40,16 +50,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb } -# are we on a target board? If so, don't run these tests. -# note: this is necessary because we cannot use runto_main (which would -# work for remote targets too) because of the different prompt we get -# when using annotation level 2. -# -if ![isnative] then { - return 0 -} - - gdb_exit gdb_start gdb_reinitialize_dir $srcdir/$subdir diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp index a148577..a7f9af9 100644 --- a/gdb/testsuite/gdb.base/long_long.exp +++ b/gdb/testsuite/gdb.base/long_long.exp @@ -1,4 +1,4 @@ -# Copyright 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +# Copyright 1997, 1998, 1999, 2000, 2001 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 @@ -25,6 +25,10 @@ if $tracelevel then { strace $tracelevel } +if [target_info exists no_long_long] { + return 0 +} + set testfile long_long set srcfile ${srcdir}/${subdir}/${testfile}.c set binfile ${objdir}/${subdir}/${testfile} diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp index c0b4718..55f6104 100644 --- a/gdb/testsuite/gdb.base/maint.exp +++ b/gdb/testsuite/gdb.base/maint.exp @@ -1,4 +1,4 @@ -# Copyright 1998, 1999, 2000 Free Software Foundation, Inc. +# Copyright 1998, 1999, 2000, 2001 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 @@ -343,7 +343,7 @@ set timeout $old_timeout send_gdb "maint print type argc\n" gdb_expect { - -re "type node $hex\r\nname .int. \\($hex\\)\r\ncode $hex \\(TYPE_CODE_INT\\)\r\nlength 4\r\nobjfile $hex\r\ntarget_type $hex\r\npointer_type $hex\r\nreference_type $hex\r\nflags $hex\r\nnfields 0 $hex\r\nvptr_basetype $hex\r\nvptr_fieldno -1\r\ntype_specific $hex\r\n$gdb_prompt $"\ + -re "type node $hex\r\nname .int. \\($hex\\)\r\ncode $hex \\(TYPE_CODE_INT\\)\r\nlength \[24\]\r\nobjfile $hex\r\ntarget_type $hex\r\npointer_type $hex\r\nreference_type $hex\r\nflags $hex\r\nnfields 0 $hex\r\nvptr_basetype $hex\r\nvptr_fieldno -1\r\ntype_specific $hex\r\n$gdb_prompt $"\ { pass "maint print type" } -re ".*$gdb_prompt $" { fail "maint print type" } timeout { fail "(timeout) maint print type" } diff --git a/gdb/testsuite/gdb.c++/ctti.exp b/gdb/testsuite/gdb.c++/ctti.exp index 645a542..96e9fcf 100644 --- a/gdb/testsuite/gdb.c++/ctti.exp +++ b/gdb/testsuite/gdb.c++/ctti.exp @@ -1,4 +1,4 @@ -# Copyright 1998, 1999 Free Software Foundation, Inc. +# Copyright 1998, 1999, 2001 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 @@ -29,6 +29,7 @@ if $tracelevel then { strace $tracelevel } +if { [skip_cplus_tests] } { continue } # Check to see if we have an executable to test. If not, then either we # haven't tried to compile one, or the compilation failed for some reason. diff --git a/gdb/testsuite/gdb.c++/namespace.exp b/gdb/testsuite/gdb.c++/namespace.exp index a88a25a..a30ce0c 100644 --- a/gdb/testsuite/gdb.c++/namespace.exp +++ b/gdb/testsuite/gdb.c++/namespace.exp @@ -1,4 +1,4 @@ -# Copyright 1997, 1998, 2000 Free Software Foundation, Inc. +# Copyright 1997, 1998, 2000, 2001 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 @@ -35,6 +35,7 @@ if $tracelevel then { set prms_id 0 set bug_id 0 +if { [skip_cplus_tests] } { continue } set testfile "namespace" set srcfile ${testfile}.cc |