X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftestsuite%2Fgdb.base%2Feval-skip.exp;h=8a4eb3ff30d96a7ebdab89dcde763627f92d1c57;hb=618f726fcb851883a0094aa7fa17003889b7189f;hp=4e17e6119755dee9e9b1d033693a738330b8e77f;hpb=5b64ad42d36e6d487e1f7287d37fbc243a178e72;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/testsuite/gdb.base/eval-skip.exp b/gdb/testsuite/gdb.base/eval-skip.exp
index 4e17e61197..8a4eb3ff30 100644
--- a/gdb/testsuite/gdb.base/eval-skip.exp
+++ b/gdb/testsuite/gdb.base/eval-skip.exp
@@ -1,21 +1,17 @@
-# Copyright (C) 1998 Free Software Foundation, Inc.
+# Copyright 1998-2016 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 <http://www.gnu.org/licenses/>.
 
 # This file was written by Elena Zannoni (ezannoni@cygnus.com)
 
@@ -32,29 +28,22 @@
 #
 
 
-if $tracelevel then {
-        strace $tracelevel
-}
-
 # Check to see if we have an executable to test.  If not, then either we
 # haven't tried to compile one, or the compilation failed for some reason.
 # In either case, just notify the user and skip the tests in this file.
 
-set testfile "int-type"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile int-type.c
 
-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 eval-skip.exp
+     return -1
     }
 
+if [get_compiler_info] {
+    return -1
+}
 
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 
 if ![runto_main] then {
@@ -62,284 +51,92 @@ if ![runto_main] then {
     continue
 }
 
-gdb_test "set variable x=14" "" "set variable x=14"
-gdb_test "set variable y=2" "" "set variable y=2"
-gdb_test "set variable z=2" "" "set variable z=2"
-gdb_test "set variable w=3" "" "set variable w=3"
-
-
-send_gdb "print (0 && (x+y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x+y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x+y))" }
-    timeout           { fail "(timeout) print value of (0 && (x+y))" }
-  }
-
-
-send_gdb "print (0 && (x-y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x-y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x-y))" }
-    timeout           { fail "(timeout) print value of (0 && (x-y))" }
-  }
-
-
-send_gdb "print (0 && (x*y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x*y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x*y))" }
-    timeout           { fail "(timeout) print value of (0 && (x*y))" }
-  }
-
-
-
-send_gdb "print (0 && (x/y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x/y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x/y))" }
-    timeout           { fail "(timeout) print value of (0 && (x/y))" }
-  }
-
-
-send_gdb "print (0 && (x%y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x%y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x%y))" }
-    timeout           { fail "(timeout) print value of (0 && (x%y))" }
-  }
-
-
-send_gdb "print (0 && (x&&y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x&&y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x&&y))" }
-    timeout           { fail "(timeout) print value of (0 && (x&&y))" }
-  }
-
-
-
-send_gdb "print (0 && (x||y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x||y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x||y))" }
-    timeout           { fail "(timeout) print value of (0 && (x||y))" }
-  }
-
-
-
-send_gdb "print (0 && (x&y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x&y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x&y))" }
-    timeout           { fail "(timeout) print value of (0 && (x&y))" }
-  }
-
-
-send_gdb "print (0 && (x|y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x|y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x|y))" }
-    timeout           { fail "(timeout) print value of (0 && (x|y))" }
-  }
-
-
-send_gdb "print (0 && (x^y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x^y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x^y))" }
-    timeout           { fail "(timeout) print value of (0 && (x^y))" }
-  }
-
-
-
-send_gdb "print (0 && (x < y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x < y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x < y))" }
-    timeout           { fail "(timeout) print value of (0 && (x < y))" }
-  }
-
-
-send_gdb "print (0 && (x <= y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x <= y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x <= y))" }
-    timeout           { fail "(timeout) print value of (0 && (x <= y))" }
-  }
-
-
-
-send_gdb "print (0 && (x>y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x>y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x>y))" }
-    timeout           { fail "(timeout) print value of (0 && (x>y))" }
-  }
-
-
-send_gdb "print (0 && (x>=y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x>=y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x>=y))" }
-    timeout           { fail "(timeout) print value of (0 && (x>=y))" }
-  }
-
-
-
-send_gdb "print (0 && (x==y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x==y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x==y))" }
-    timeout           { fail "(timeout) print value of (0 && (x==y))" }
-  }
-
-
-send_gdb "print (0 && (x!=y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x!=y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x!=y))" }
-    timeout           { fail "(timeout) print value of (0 && (x!=y))" }
-  }
-
-
-send_gdb "print (0 && (x<<31))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x<<31))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x<<31))" }
-    timeout           { fail "(timeout) print value of (0 && (x<<31))" }
-  }
-
-
-send_gdb "print (0 && (x>>31))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x>>31))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x>>31))" }
-    timeout           { fail "(timeout) print value of (0 && (x>>31))" }
-  }
-
-
-
-send_gdb "print (0 && (!x))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (!x))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (!x))" }
-    timeout           { fail "(timeout) print value of (0 && (!x))" }
-  }
-
-
-send_gdb "print (0 && (~x))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (~x))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (~x))" }
-    timeout           { fail "(timeout) print value of (0 && (~x))" }
-  }
-
-send_gdb "print (0 && (-x))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (-x))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (-x))" }
-    timeout           { fail "(timeout) print value of (0 && (-x))" }
-  }
-
-
-send_gdb "print (0 && (x++))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x++))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x++))" }
-    timeout           { fail "(timeout) print value of (0 && (x++))" }
-  }
-
-
-send_gdb "print (0 && (++x))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (++x))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (++x))" }
-    timeout           { fail "(timeout) print value of (0 && (++x))" }
-  }
-
-
-send_gdb "print (0 && (x--))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x--))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x--))" }
-    timeout           { fail "(timeout) print value of (0 && (x--))" }
-  }
-
-
-send_gdb "print (0 && (--x))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (--x))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (--x))" }
-    timeout           { fail "(timeout) print value of (0 && (--x))" }
-  }
-
-send_gdb "print (0 && (x+=7))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x+=7))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x+=7))" }
-    timeout           { fail "(timeout) print value of (0 && (x+=7))" }
-  }
-
-send_gdb "print (0 && (x=y))\n"
-gdb_expect {
-    -re ".$decimal = 0\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x=y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x=y))" }
-    timeout           { fail "(timeout) print value of (0 && (x=y))" }
-  }
+gdb_test_no_output "set variable x=14" "set variable x=14"
+gdb_test_no_output "set variable y=2" "set variable y=2"
+gdb_test_no_output "set variable z=2" "set variable z=2"
+gdb_test_no_output "set variable w=3" "set variable w=3"
+
+gdb_test "print (0 && (x+y))" ".$decimal = $false" \
+    "print value of (0 && (x+y))"
+
+gdb_test "print (0 && (x-y))" ".$decimal = $false" \
+    "print value of (0 && (x-y))"
+
+gdb_test "print (0 && (x*y))" ".$decimal = $false" \
+    "print value of (0 && (x*y))"
+
+gdb_test "print (0 && (x/y))" ".$decimal = $false" \
+    "print value of (0 && (x/y))"
+
+gdb_test "print (0 && (x%y))" ".$decimal = $false" \
+    "print value of (0 && (x%y))"
+
+gdb_test "print (0 && (x&&y))" ".$decimal = $false" \
+    "print value of (0 && (x&&y))"
+
+gdb_test "print (0 && (x||y))" ".$decimal = $false" \
+    "print value of (0 && (x||y))"
+
+gdb_test "print (0 && (x&y))" ".$decimal = $false" \
+    "print value of (0 && (x&y))"
+
+gdb_test "print (0 && (x|y))" ".$decimal = $false" \
+    "print value of (0 && (x|y))"
+
+gdb_test "print (0 && (x^y))" ".$decimal = $false" \
+    "print value of (0 && (x^y))"
+
+gdb_test "print (0 && (x < y))" ".$decimal = $false" \
+    "print value of (0 && (x < y))"
+
+gdb_test "print (0 && (x <= y))" ".$decimal = $false" \
+    "print value of (0 && (x <= y))"
+
+gdb_test "print (0 && (x>y))" ".$decimal = $false" \
+    "print value of (0 && (x>y))"
+
+gdb_test "print (0 && (x>=y))" ".$decimal = $false" \
+    "print value of (0 && (x>=y))"
+
+gdb_test "print (0 && (x==y))" ".$decimal = $false" \
+    "print value of (0 && (x==y))"
+
+gdb_test "print (0 && (x!=y))" ".$decimal = $false" \
+    "print value of (0 && (x!=y))"
+
+gdb_test "print (0 && (x<<31))" ".$decimal = $false" \
+    "print value of (0 && (x<<31))"
+
+gdb_test "print (0 && (x>>31))" ".$decimal = $false" \
+    "print value of (0 && (x>>31))"
+
+gdb_test "print (0 && (!x))" ".$decimal = $false" \
+    "print value of (0 && (!x))"
+
+gdb_test "print (0 && (~x))" ".$decimal = $false" \
+    "print value of (0 && (~x))"
+
+gdb_test "print (0 && (-x))" ".$decimal = $false" \
+    "print value of (0 && (-x))"
+
+gdb_test "print (0 && (x++))" ".$decimal = $false" \
+    "print value of (0 && (x++))"
+
+gdb_test "print (0 && (++x))" ".$decimal = $false" \
+    "print value of (0 && (++x))"
+
+gdb_test "print (0 && (x--))" ".$decimal = $false" \
+    "print value of (0 && (x--))"
+
+gdb_test "print (0 && (--x))" ".$decimal = $false" \
+    "print value of (0 && (--x))"
+
+gdb_test "print (0 && (x+=7))" ".$decimal = $false" \
+    "print value of (0 && (x+=7))"
+
+gdb_test "print (0 && (x=y))" ".$decimal = $false" \
+    "print value of (0 && (x=y))"
+
 
 gdb_exit
 return 0