2004-06-14 Andrew Cagney <cagney@gnu.org>

	* gdb.base/gcore.exp (capture_command_output): Delete the always
	passing tests containing inferior values.
	* gdb.base/ending-run.exp: Do not include the breakpoint address
	in the test message.  Update copyright.
	* gdb.base/sizeof.exp (check_sizeof): Do not include the type's
	size in the test name, use gdb_test_multiple.  Update copyright.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9c5b86b..746f766 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-14  Andrew Cagney  <cagney@gnu.org>
+
+       * gdb.base/gcore.exp (capture_command_output): Delete the always
+       passing tests containing inferior values.
+       * gdb.base/ending-run.exp: Do not include the breakpoint address
+       in the test message.  Update copyright.
+       * gdb.base/sizeof.exp (check_sizeof): Do not include the type's
+       size in the test name, use gdb_test_multiple.  Update copyright.
+

 2004-06-14  Michael Chastain  <mec.gnu@mindspring.com>
 
        * gdb.cp/ref-types.cc: Add copyright notice.
 2004-06-14  Michael Chastain  <mec.gnu@mindspring.com>
 
        * gdb.cp/ref-types.cc: Add copyright notice.

diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index af32acd..1363a00 100644 (file)
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -1,4 +1,7 @@
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# This testcase is part of GDB, the GNU debugger.
+
+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 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
 
 # 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


@@ -12,10 +15,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # 
 # 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
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 
 # use this to debug:
 #
 
 # use this to debug:
 #


@@ -109,7 +109,7 @@ gdb_expect {
     -re ".*address (0x\[0-9a-fA-F]*).*$gdb_prompt $" {
         set line_nine $expect_out(1,string)
         gdb_test "b ending-run.c:14" ".*Breakpoint 7.*ending-run.c, line 14.*"
     -re ".*address (0x\[0-9a-fA-F]*).*$gdb_prompt $" {
         set line_nine $expect_out(1,string)
         gdb_test "b ending-run.c:14" ".*Breakpoint 7.*ending-run.c, line 14.*"

-        gdb_test "b *$line_nine" ".*Note.*also.*Breakpoint 8.*"
+        gdb_test "b *$line_nine" ".*Note.*also.*Breakpoint 8.*" "Breakpoint 7 at *ending-run.c:14"

         gdb_test "c" ".*Breakpoint.*7.*callee.*14.*"
         gdb_test "cle" ".*Deleted breakpoints 8 7.*" "Clear 2 by default"
     }
         gdb_test "c" ".*Breakpoint.*7.*callee.*14.*"
         gdb_test "cle" ".*Deleted breakpoints 8 7.*" "Clear 2 by default"
     }

diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp
index 33fcba4..29239ef 100644 (file)
--- a/gdb/testsuite/gdb.base/gcore.exp
+++ b/gdb/testsuite/gdb.base/gcore.exp
@@ -187,7 +187,6 @@ if ![string compare $pre_corefile_allregs $post_corefile_allregs] then {
 
 set post_corefile_extern_array \
        [capture_command_output "print extern_array" "$print_prefix"]
 
 set post_corefile_extern_array \
        [capture_command_output "print extern_array" "$print_prefix"]

-pass "extern_array = $post_corefile_extern_array"

 if ![string compare $pre_corefile_extern_array $post_corefile_extern_array]  {
     pass "corefile restored extern array"
 } else {
 if ![string compare $pre_corefile_extern_array $post_corefile_extern_array]  {
     pass "corefile restored extern array"
 } else {


@@ -196,7 +195,6 @@ if ![string compare $pre_corefile_extern_array $post_corefile_extern_array]  {
 
 set post_corefile_static_array \
        [capture_command_output "print static_array" "$print_prefix"]
 
 set post_corefile_static_array \
        [capture_command_output "print static_array" "$print_prefix"]

-pass "static_array = $post_corefile_static_array"

 if ![string compare $pre_corefile_static_array $post_corefile_static_array]  {
     pass "corefile restored static array"
 } else {
 if ![string compare $pre_corefile_static_array $post_corefile_static_array]  {
     pass "corefile restored static array"
 } else {


@@ -205,7 +203,6 @@ if ![string compare $pre_corefile_static_array $post_corefile_static_array]  {
 
 set post_corefile_uninit_array \
        [capture_command_output "print un_initialized_array" "$print_prefix"]
 
 set post_corefile_uninit_array \
        [capture_command_output "print un_initialized_array" "$print_prefix"]

-pass "uninit_array = $post_corefile_uninit_array"

 if ![string compare $pre_corefile_uninit_array $post_corefile_uninit_array]  {
     pass "corefile restored un-initialized array"
 } else {
 if ![string compare $pre_corefile_uninit_array $post_corefile_uninit_array]  {
     pass "corefile restored un-initialized array"
 } else {


@@ -214,7 +211,6 @@ if ![string compare $pre_corefile_uninit_array $post_corefile_uninit_array]  {
 
 set post_corefile_heap_string \
        [capture_command_output "print heap_string" "$print_prefix"]
 
 set post_corefile_heap_string \
        [capture_command_output "print heap_string" "$print_prefix"]

-pass "heap_string = $post_corefile_heap_string"

 if ![string compare $pre_corefile_heap_string $post_corefile_heap_string]  {
     pass "corefile restored heap array"
 } else {
 if ![string compare $pre_corefile_heap_string $post_corefile_heap_string]  {
     pass "corefile restored heap array"
 } else {


@@ -223,7 +219,6 @@ if ![string compare $pre_corefile_heap_string $post_corefile_heap_string]  {
 
 set post_corefile_local_array \
        [capture_command_output "print array_func::local_array" "$print_prefix"]
 
 set post_corefile_local_array \
        [capture_command_output "print array_func::local_array" "$print_prefix"]

-pass "local_array = $post_corefile_local_array"

 if ![string compare $pre_corefile_local_array $post_corefile_local_array]  {
     pass "corefile restored stack array"
 } else {
 if ![string compare $pre_corefile_local_array $post_corefile_local_array]  {
     pass "corefile restored stack array"
 } else {

diff --git a/gdb/testsuite/gdb.base/sizeof.exp b/gdb/testsuite/gdb.base/sizeof.exp
index 7fcbe0e..c12c699 100644 (file)
--- a/gdb/testsuite/gdb.base/sizeof.exp
+++ b/gdb/testsuite/gdb.base/sizeof.exp
@@ -1,4 +1,6 @@
-# Copyright 2000, 2002 Free Software Foundation, Inc.
+# This testcase is part of GDB, the GNU debugger.
+
+# Copyright 2000, 2002, 2003, 2004 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
 
 # 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


@@ -14,9 +16,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 
 # 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
-

 if $tracelevel {
     strace $tracelevel
 }
 if $tracelevel {
     strace $tracelevel
 }


@@ -103,16 +102,10 @@ proc check_sizeof { type size } {
     }
 
     set pat [string_to_regexp "sizeof (${type}) == ${size}"]
     }
 
     set pat [string_to_regexp "sizeof (${type}) == ${size}"]

-    send_gdb "next\n"
-    gdb_expect {
+    set test "check sizeof ${type}"
+    gdb_test_multiple "next" "$test" {

        -re "${pat}\[\r\n\].*$gdb_prompt $" {
        -re "${pat}\[\r\n\].*$gdb_prompt $" {

-           pass "check sizeof ${type} == ${size}"
-       }
-       -re ".*$gdb_prompt $" {
-           fail "check sizeof ${type} == ${size}"
-       }
-       timeout {
-           fail "check sizeof ${type} == ${size} (timeout)"
+           pass "$test"

        }
     }
 }
        }
     }
 }