From f7d690e5af308c9fab11d9d71a324f9efa7d1a40 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Fri, 16 Jul 2004 19:08:42 +0000 Subject: [PATCH] 2004-07-16 Andrew Cagney * gdb.base/logical.exp: Update copyright. (evaluate): New procedure. Use to re-implement tests using several tables. --- gdb/testsuite/ChangeLog | 6 + gdb/testsuite/gdb.base/logical.exp | 589 ++++------------------------- 2 files changed, 78 insertions(+), 517 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 396d65ac474..325895a3348 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2004-07-16 Andrew Cagney + + * gdb.base/logical.exp: Update copyright. + (evaluate): New procedure. Use to re-implement tests using + several tables. + 2004-07-14 Martin Hunt * lib/insight-support.exp (gdbtk_start): Unset TCL_LIBRARY diff --git a/gdb/testsuite/gdb.base/logical.exp b/gdb/testsuite/gdb.base/logical.exp index 304f45c66ec..231f8ae01cf 100644 --- a/gdb/testsuite/gdb.base/logical.exp +++ b/gdb/testsuite/gdb.base/logical.exp @@ -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,74 @@ 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] + 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 $var, $op" " = $val" "evaluate $op; variables $var; expecting $val" + } + } +} +# 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 } +} -- 2.30.2