This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
Re: [patch/rfc] Fix non-portable test names
- From: Andrew Cagney <cagney at gnu dot org>
- To: Michael Elizabeth Chastain <mec dot gnu at mindspring dot com>
- Cc: gdb-patches at sources dot redhat dot com
- Date: Mon, 14 Jun 2004 20:15:50 -0400
- Subject: Re: [patch/rfc] Fix non-portable test names
- References: <20040614190457.1CEF44B104@berman.michael-chastain.com>
Cool, I like it when 'diff old/gdb.sum new/gdb.sum' works better.
(1) gdb.base/ending-run.exp needs its copyright years updated.
It was edited in 2003, and you are editing it in 2004.
(2) Ditto with gdb.base/sizeof.exp copyright years.
Fixed.
(3) Did you test it?
I've been comparing amd64 and i386 test outputs (so i guess yes :-).
committed as attached,
Andrew
Michael C
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.
Index: gdb.base/ending-run.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/ending-run.exp,v
retrieving revision 1.22
diff -p -u -r1.22 ending-run.exp
--- gdb.base/ending-run.exp 7 Oct 2003 16:02:16 -0000 1.22
+++ gdb.base/ending-run.exp 15 Jun 2004 00:13:35 -0000
@@ -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
@@ -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
-# 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:
#
@@ -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.*"
- 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"
}
Index: gdb.base/gcore.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/gcore.exp,v
retrieving revision 1.6
diff -p -u -r1.6 gcore.exp
--- gdb.base/gcore.exp 2 Feb 2004 05:15:27 -0000 1.6
+++ gdb.base/gcore.exp 15 Jun 2004 00:13:35 -0000
@@ -187,7 +187,6 @@ if ![string compare $pre_corefile_allreg
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 {
@@ -196,7 +195,6 @@ if ![string compare $pre_corefile_extern
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 {
@@ -205,7 +203,6 @@ if ![string compare $pre_corefile_static
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 {
@@ -214,7 +211,6 @@ if ![string compare $pre_corefile_uninit
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 {
@@ -223,7 +219,6 @@ if ![string compare $pre_corefile_heap_s
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 {
Index: gdb.base/sizeof.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/sizeof.exp,v
retrieving revision 1.5
diff -p -u -r1.5 sizeof.exp
--- gdb.base/sizeof.exp 30 Mar 2003 04:08:16 -0000 1.5
+++ gdb.base/sizeof.exp 15 Jun 2004 00:13:35 -0000
@@ -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
@@ -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.
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
if $tracelevel {
strace $tracelevel
}
@@ -103,16 +102,10 @@ proc check_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 $" {
- pass "check sizeof ${type} == ${size}"
- }
- -re ".*$gdb_prompt $" {
- fail "check sizeof ${type} == ${size}"
- }
- timeout {
- fail "check sizeof ${type} == ${size} (timeout)"
+ pass "$test"
}
}
}