From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30266 invoked by alias); 13 Jun 2004 19:37:34 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 30259 invoked from network); 13 Jun 2004 19:37:34 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 13 Jun 2004 19:37:34 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i5DJbXi7006752 for ; Sun, 13 Jun 2004 15:37:33 -0400 Received: from localhost.redhat.com (porkchop.devel.redhat.com [172.16.58.2]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i5DJbX023729; Sun, 13 Jun 2004 15:37:33 -0400 Received: from gnu.org (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id 7B0892B9D; Sun, 13 Jun 2004 15:37:19 -0400 (EDT) Message-ID: <40CCACEF.4090203@gnu.org> Date: Sun, 13 Jun 2004 19:37:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-GB; rv:1.4.1) Gecko/20040217 MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Subject: [patch/rfc] Fix non-portable test names Content-Type: multipart/mixed; boundary="------------040700030005080700090401" X-SW-Source: 2004-06/txt/msg00305.txt.bz2 This is a multi-part message in MIME format. --------------040700030005080700090401 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 137 Hello, This patch tweaks a few test cases so that the test names don't include inferior dependant values. thoughts? michaelc? Andrew --------------040700030005080700090401 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 4069 2004-06-13 Andrew Cagney * 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. * gdb.base/sizeof.exp (check_sizeof): Do not include the type's size in the test name, use gdb_test_multiple. 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 13 Jun 2004 19:34:57 -0000 @@ -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 13 Jun 2004 19:34:57 -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 13 Jun 2004 19:34:57 -0000 @@ -103,16 +103,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" } } } --------------040700030005080700090401--