From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14545 invoked by alias); 14 Jul 2004 16:38:54 -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 14538 invoked from network); 14 Jul 2004 16:38:53 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 14 Jul 2004 16:38:53 -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 i6EGcre3021071 for ; Wed, 14 Jul 2004 12:38:53 -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 i6EGcr008902; Wed, 14 Jul 2004 12:38:53 -0400 Received: from gnu.org (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id EB26C2B9D; Wed, 14 Jul 2004 12:38:40 -0400 (EDT) Message-ID: <40F56190.7080108@gnu.org> Date: Wed, 14 Jul 2004 16:38: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: [rfc] Revamp logical.exp Content-Type: multipart/mixed; boundary="------------050809020100010205040100" X-SW-Source: 2004-07/txt/msg00159.txt.bz2 This is a multi-part message in MIME format. --------------050809020100010205040100 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 194 Hello, This revamps logical.exp so that it is driven by a number of tables. In the process it expands the test coverage slightly, and gets rid of any duplicate test names. thoughts? Andrew --------------050809020100010205040100 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 17878 2004-07-14 Andrew Cagney * gdb.base/logical.exp: Update copyright. (evaluate): New procedure. Use to re-implement tests using several tables. Index: testsuite/gdb.base/logical.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/logical.exp,v retrieving revision 1.2 diff -p -u -r1.2 logical.exp --- testsuite/gdb.base/logical.exp 6 Mar 2001 08:21:50 -0000 1.2 +++ testsuite/gdb.base/logical.exp 14 Jul 2004 16:36:30 -0000 @@ -1,4 +1,6 @@ -# Copyright 1998, 1999 Free Software Foundation, Inc. +# This testcase is part of GDB, the GNU debugger. + +# Copyright 1998, 1999, 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,21 +16,15 @@ # 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 - # This file was written by Elena Zannoni (ezannoni@cygnus.com) -# This file is part of the gdb testsuite +# Tests for correctenss of logical operators, associativity and +# precedence with integer type variables -# -# tests for correctenss of logical operators, associativity and precedence -# with integer type variables -# if $tracelevel then { - strace $tracelevel - } + strace $tracelevel +} # # test running programs @@ -41,8 +37,8 @@ set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } { - 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}] { return -1; @@ -63,515 +59,75 @@ if ![runto_main] then { continue } -# -# test expressions with "int" types -# - -gdb_test "set variable x=0" "" "set variable x=0" -gdb_test "set variable y=0" "" "set variable y=0" -gdb_test "set variable z=0" "" "set variable z=0" - -send_gdb "print x\n" -gdb_expect { - -re ".*0.*$gdb_prompt $" { - pass "print value of x" - } - -re ".*$gdb_prompt $" { fail "print value of x" } - timeout { fail "(timeout) print value of x" } - } - - -send_gdb "print y\n" -gdb_expect { - -re ".*0.*$gdb_prompt $" { - pass "print value of y" - } - -re ".*$gdb_prompt $" { fail "print value of y" } - timeout { fail "(timeout) print value of y" } - } - -send_gdb "print z\n" -gdb_expect { - -re ".*0.*$gdb_prompt $" { - pass "print value of z" - } - -re ".*$gdb_prompt $" { fail "print value of z" } - timeout { fail "(timeout) print value of z" } - } - - -# truth tables for && , || , ! - -send_gdb "print x && y\n" -gdb_expect { - -re ".*$false.*$gdb_prompt $" { - pass "print value of xy" - } - -re ".*$gdb_prompt $" { fail "print value of x>y" } - timeout { fail "(timeout) print value of x>y" } - } - -gdb_test "set variable y=1" "" "set variable y=1" - -send_gdb "print x && y\n" -gdb_expect { - -re ".*$false.*$gdb_prompt $" { - pass "print value of xy" - } - -re ".*$gdb_prompt $" { fail "print value of x>y" } - timeout { fail "(timeout) print value of x>y" } - } - -gdb_test "set variable y=0" "" "set variable y=0" - -send_gdb "print x && y\n" -gdb_expect { - -re ".*$false.*$gdb_prompt $" { - pass "print value of x y || w == z\n" -gdb_expect { - -re ".*$true.*$gdb_prompt $" { - pass "print value of x > y || w == z" - } - -re ".*$gdb_prompt $" { fail "print value of x > y || w == z" } - timeout { fail "(timeout) print value of x > y || w == z " } - } - - -gdb_test "set variable x=1" "" "set variable x=1" -gdb_test "set variable y=2" "" "set variable y=2" -gdb_test "set variable w=1" "" "set variable w=1" -gdb_test "set variable z=3" "" "set variable z=3" - - -send_gdb "print x >= y && w != z\n" -gdb_expect { - -re ".*$false.*$gdb_prompt $" { - pass "print value of x >= y || w != z" - } - -re ".*$gdb_prompt $" { fail "print value of x >= y || w != z" } - timeout { fail "(timeout) print value of x >= y || w != z " } - } - - - -gdb_test "set variable x=2" "" "set variable x=2" -gdb_test "set variable y=2" "" "set variable y=2" -gdb_test "set variable w=2" "" "set variable w=2" -gdb_test "set variable z=3" "" "set variable z=3" - - -send_gdb "print ! x > y || w + z\n" -gdb_expect { - -re ".*$true.*$gdb_prompt $" { - pass "print value of x > y || w != z" - } - -re ".*$gdb_prompt $" { fail "print value of x > y || w != z" } - timeout { fail "(timeout) print value of x > y || w != z " } - } - - - - - - - - - +proc evaluate { vars ops } { + for {set vari 0} {$vari < [llength $vars]} {incr vari} { + set var [lindex $vars $vari] + gdb_test "set variable $var" "" "$var; set variables" + for {set opi 0} {$opi < [llength $ops]} {incr opi} { + set op [lindex [lindex $ops $opi] 0] + set val [lindex [lindex $ops $opi] [expr $vari + 1]] + gdb_test "print $op" " = $val" "$var; $op" + } + } +} +# Unary +evaluate { + {x=0} {x=1} +} { + { {x} 0 1 } + { {!x} 1 0 } + { {!!x} 0 1 } +} +# Binary (with unary) +evaluate { + {x=0,y=0} {x=0,y=1} {x=1,y=0} {x=1,y=1} +} { + { {x && y} 0 0 0 1 } + { {!x && y} 0 1 0 0 } + { {x && !y} 0 0 1 0 } + { {!x && !y} 1 0 0 0 } + + { {x || y} 0 1 1 1 } + { {!x || y} 1 1 0 1 } + { {x || !y} 1 0 1 1 } + { {!x || !y} 1 1 1 0 } + + { {x < y} 0 1 0 0 } + { {x <= y} 1 1 0 1 } + { {x == y} 1 0 0 1 } + { {x != y} 0 1 1 0 } + { {x >= y} 1 0 1 1 } + { {x > y} 0 0 1 0 } +} +# Full table of &&, || combinations, followed by random mix of unary ops +evaluate { + {x=0,y=0,z=0} {x=0,y=0,z=1} {x=0,y=1,z=0} {x=0,y=1,z=1} + {x=1,y=0,z=0} {x=1,y=0,z=1} {x=1,y=1,z=0} {x=1,y=1,z=1} +} { + { {x && y && z} 0 0 0 0 0 0 0 1 } + { {x || y && z} 0 0 0 1 1 1 1 1 } + { {x && y || z} 0 1 0 1 0 1 1 1 } + { {x || y || z} 0 1 1 1 1 1 1 1 } + + { {x || !y && z} 0 1 0 0 1 1 1 1 } + { {!x || y && z} 1 1 1 1 0 0 0 1 } + { {!x || y && !z} 1 1 1 1 0 0 1 0 } +} +# More complex operations +evaluate { + {x=1,y=2,w=3,z=3} + {x=1,y=2,w=1,z=3} + {x=2,y=2,w=2,z=3} +} { + { {x > y || w == z} 1 0 0 } + { {x >= y && w != z} 0 0 1 } + { {! x > y || w + z} 1 1 1 } +} --------------050809020100010205040100--