X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftestsuite%2Fgdb.base%2Fcond-expr.exp;h=9ba04db1ec3181ebd6ab43595fc90fe3a9ec1d4c;hb=5b362f04b2a56d446b024027963be52d61f939cb;hp=0e78b427795e8fa4e917e4439ef02ed1dd24e8d6;hpb=ed288bb597072176e84fc8279707a3f2f475779b;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/testsuite/gdb.base/cond-expr.exp b/gdb/testsuite/gdb.base/cond-expr.exp
index 0e78b42779..9ba04db1ec 100644
--- a/gdb/testsuite/gdb.base/cond-expr.exp
+++ b/gdb/testsuite/gdb.base/cond-expr.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)
 
@@ -31,26 +27,19 @@
 #
 
 
-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}
-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."
+standard_testfile int-type.c
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
+     untested "failed to compile"
+     return -1
     }
 
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 
 if ![runto_main] then {
@@ -58,57 +47,26 @@ if ![runto_main] then {
     continue
 }
 
-send_gdb "print (2 ? 3 : 4)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 3.*$gdb_prompt $" {
-        pass "print value of cond expr (const true)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of cond expr (const true)" }
-    timeout           { fail "(timeout) print value of cond expr (const true)" }
-  }
-
-send_gdb "print (0 ? 3 : 4)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 4.*$gdb_prompt $" {
-        pass "print value of cond expr (const false)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of cond expr (const false)" }
-    timeout           { fail "(timeout) print value of cond expr (const false)" }
-  }
-
-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=3" "" "set variable z=3"
-
-send_gdb "print (x ? y : z)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 2.*$gdb_prompt $" {
-        pass "print value of cond expr (var true)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of cond expr (var true)" }
-    timeout           { fail "(timeout) print value of cond expr (var true)" }
-  }
-
-gdb_test "set variable x=0" "" "set variable x=0"
-
-send_gdb "print (x ? y : z)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 3.*$gdb_prompt $" {
-        pass "print value of cond expr (var false)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of cond expr (var false)" }
-    timeout           { fail "(timeout) print value of cond expr (var false)" }
-  }
-
-
-send_gdb "whatis (0 ? 3 : 4)\n"
-gdb_expect {
-    -re "type = int.*$gdb_prompt $" {
-        pass "print whatis of cond expr"
-      }
-    -re ".*$gdb_prompt $" { fail "print whatis of cond expr" }
-    timeout           { fail "(timeout) print whatis of cond expr" }
-  }
+gdb_test "print (2 ? 3 : 4)" "\[0-9\]* = 3" \
+    "print value of cond expr (const true)"
+
+gdb_test "print (0 ? 3 : 4)" "\[0-9\]* = 4" \
+    "print value of cond expr (const false)"
+
+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=3" "set variable z=3"
+
+gdb_test "print (x ? y : z)" "\[0-9\]* = 2" \
+    "print value of cond expr (var true)"
+
+gdb_test_no_output "set variable x=0" "set variable x=0"
+
+gdb_test "print (x ? y : z)" "\[0-9\]* = 3" \
+    "print value of cond expr (var false)"
+
+gdb_test "whatis (0 ? 3 : 4)" "type = int" \
+    "print whatis of cond expr"