X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftestsuite%2Fgdb.base%2Flogical.exp;h=e228c08ef1f0102defbfdc37d59e15d5d1d4e4bc;hb=bf9e4d0c1f88710c2a389bf4b1bdf1d0d83fa7f4;hp=9d410c6f61f628a66683717f66e474d0303ac359;hpb=30727aa6d12fb866494020c0b62ab265a2bdcdfe;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/testsuite/gdb.base/logical.exp b/gdb/testsuite/gdb.base/logical.exp
index 9d410c6f61..e228c08ef1 100644
--- a/gdb/testsuite/gdb.base/logical.exp
+++ b/gdb/testsuite/gdb.base/logical.exp
@@ -1,51 +1,41 @@
-# Copyright (C) 1998 Free Software Foundation, Inc.
+# This testcase is part of GDB, the GNU debugger.
+
+# Copyright 1998-2013 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# 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
+# along with this program. If not, see .
# 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
- }
#
# test running programs
#
-set prms_id 0
-set bug_id 0
set testfile "int-type"
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."
- }
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
+ untested logical.exp
+ return -1
+}
-if [get_compiler_info ${binfile}] {
- return -1;
+if [get_compiler_info] {
+ return -1
}
gdb_exit
@@ -63,515 +53,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 }
+}