From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26610 invoked by alias); 19 Jul 2004 15:17:12 -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 26601 invoked from network); 19 Jul 2004 15:17:10 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 19 Jul 2004 15:17:10 -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 i6JFHAe3031873 for ; Mon, 19 Jul 2004 11:17:10 -0400 Received: from localhost.redhat.com (to-dhcp51.toronto.redhat.com [172.16.14.151]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i6JFH8a23178; Mon, 19 Jul 2004 11:17:08 -0400 Received: from gnu.org (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id 1165A2B9D; Mon, 19 Jul 2004 11:17:13 -0400 (EDT) Message-ID: <40FBE5F8.6010203@gnu.org> Date: Mon, 19 Jul 2004 15:17: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] Cleanup store.exp Content-Type: multipart/mixed; boundary="------------040706010009060508030403" X-SW-Source: 2004-07/txt/msg00235.txt.bz2 This is a multi-part message in MIME format. --------------040706010009060508030403 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 52 It's got duplicate test messages. thoughts? Andrew --------------040706010009060508030403 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 5795 2004-07-19 Andrew Cagney * gdb.base/store.exp: Update copyright. Tweak indentation. (check_set, up_set, check_struct, up_struct): Add a prefix to test names, do not import gdb_prompt. Index: gdb.base/store.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/store.exp,v retrieving revision 1.4 diff -p -u -r1.4 store.exp --- gdb.base/store.exp 3 Jul 2003 13:55:22 -0000 1.4 +++ gdb.base/store.exp 19 Jul 2004 15:14:50 -0000 @@ -1,4 +1,6 @@ -# Copyright 2002, 2003 Free Software Foundation, Inc. +# This testcase is part of GDB, the GNU debugger. + +# Copyright 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@gnu.org - if $tracelevel { strace $tracelevel } @@ -31,7 +30,7 @@ set testfile "store" set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." + gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } if [get_compiler_info ${binfile}] { @@ -55,16 +54,24 @@ if ![runto_main] then { # proc check_set { t l r new add } { - global gdb_prompt + set prefix "var ${t} l" gdb_test "tbreak wack_${t}" - gdb_test "continue" "register ${t} l = u, r = v;" "continue to wack_${t}" - gdb_test "next" "l = add_${t} .l, r.;" "next ${t}" - gdb_test "print l" " = ${l}" "print old l - ${t}" - gdb_test "print r" " = ${r}" "print old r - ${t}" - gdb_test "set variable l = 4" - gdb_test "print l" " = ${new}" "print new l - ${t}" - gdb_test "next" "return l \\+ r;" - gdb_test "print l" " = ${add}" "print add - ${t}" + gdb_test "continue" "register ${t} l = u, r = v;" \ + "continue to wack_${t}" + gdb_test "next" "l = add_${t} .l, r.;" \ + "${prefix}; next ${t}" + gdb_test "print l" " = ${l}" \ + "${prefix}; print old l, expecting ${l}" + gdb_test "print r" " = ${r}" \ + "${prefix}; print old r, expecting ${r}" + gdb_test "set variable l = 4" "" \ + "${prefix}; setting l to 4" + gdb_test "print l" " = ${new}" \ + "${prefix}; print new l, expecting ${l}" + gdb_test "next" "return l \\+ r;" \ + "${prefix}; next over add call" + gdb_test "print l" " = ${add}" \ + "${prefix}; print incremented l, expecting ${add}" } check_set "charest" "-1 .*" "-2 .*" "4 ..004." "2 ..002." @@ -79,14 +86,20 @@ check_set "doublest" "-1" "-2" "4" "2" # proc up_set { t l r new } { - global gdb_prompt + set prefix "upvar ${t} l" gdb_test "tbreak add_${t}" - gdb_test "continue" "return u . v;" "continue to add_${t}" - gdb_test "up" "l = add_${t} .l, r.;" "up ${t}" - gdb_test "print l" " = ${l}" "up print old l - ${t}" - gdb_test "print r" " = ${r}" "up print old r - ${t}" - gdb_test "set variable l = 4" - gdb_test "print l" " = ${new}" "up print new l - ${t}" + gdb_test "continue" "return u . v;" \ + "continue to add_${t}" + gdb_test "up" "l = add_${t} .l, r.;" \ + "${prefix}; up" + gdb_test "print l" " = ${l}" \ + "${prefix}; print old l, expecting ${l}" + gdb_test "print r" " = ${r}" \ + "${prefix}; print old r, expecting ${r}" + gdb_test "set variable l = 4" "" \ + "${prefix}; set l to 4" + gdb_test "print l" " = ${new}" \ + "${prefix}; print new l, expecting ${new}" } up_set "charest" "-1 .*" "-2 .*" "4 ..004." @@ -101,14 +114,18 @@ up_set "doublest" "-1" "-2" "4" # proc check_struct { t old new } { - global gdb_prompt + set prefix "var struct ${t} u" gdb_test "tbreak wack_struct_${t}" gdb_test "continue" "int i; register struct s_${t} u = z_${t};" \ - "continue set struct ${t}" - gdb_test "next 2" "add_struct_${t} .u.;" - gdb_test "print u" " = ${old}" "old check struct ${t}" - gdb_test "set variable u = s_${t}" - gdb_test "print u" " = ${new}" "new check struct ${t}" + "continue to wack_struct_${t}" + gdb_test "next 2" "add_struct_${t} .u.;" \ + "${prefix}; next to add_struct_${t} call" + gdb_test "print u" " = ${old}" \ + "${prefix}; print old u, expecting ${old}" + gdb_test "set variable u = s_${t}" "" \ + "${prefix}; set u to s_${t}" + gdb_test "print u" " = ${new}" \ + "${prefix}; print new u, expecting ${new}" } check_struct "1" "{s = \\{0}}" "{s = \\{1}}" @@ -117,14 +134,18 @@ check_struct "3" "{s = \\{0, 0, 0}}" "{s check_struct "4" "{s = \\{0, 0, 0, 0}}" "{s = \\{1, 2, 3, 4}}" proc up_struct { t old new } { - global gdb_prompt + set prefix "up struct ${t} u" gdb_test "tbreak add_struct_${t}" gdb_test "continue" "for .i = 0; i < sizeof .s. / sizeof .s.s.0..; i..." \ - "continue up struct ${t}" - gdb_test "up" "u = add_struct_${t} .u.;" "up struct ${t}" - gdb_test "print u" " = ${old}" "old up struct ${t}" - gdb_test "set variable u = s_${t}" - gdb_test "print u" " = ${new}" "new up struct ${t}" + "continue to add_struct_${t}" + gdb_test "up" "u = add_struct_${t} .u.;" \ + "${prefix}; up" + gdb_test "print u" " = ${old}" \ + "${prefix}; print old u, expecting ${old}" + gdb_test "set variable u = s_${t}" "" \ + "${prefix}; set u to s_${t}" + gdb_test "print u" " = ${new}" \ + "${prefix}; print new u, expecting ${new}" } up_struct "1" "{s = \\{0}}" "{s = \\{1}}" --------------040706010009060508030403--