Fix more cases of improper test names

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / cond-expr.exp

diff --git a/gdb/testsuite/gdb.base/cond-expr.exp b/gdb/testsuite/gdb.base/cond-expr.exp
index 76635e04ba4bd0555b2a710d5fc1355c9cf1636f..9ba04db1ec3181ebd6ab43595fc90fe3a9ec1d4c 100644 (file)
--- a/gdb/testsuite/gdb.base/cond-expr.exp
+++ b/gdb/testsuite/gdb.base/cond-expr.exp
@@ -1,4 +1,4 @@
-# Copyright 1998, 1999, 2007, 2008, 2009, 2010 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
@@ -27,27 +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}
+standard_testfile int-type.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested cond-expr.exp
+     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 {
@@ -61,14 +53,14 @@ gdb_test "print (2 ? 3 : 4)" "\[0-9\]* = 3" \
 gdb_test "print (0 ? 3 : 4)" "\[0-9\]* = 4" \
     "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"
+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 "set variable x=0" "" "set variable x=0"
+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)"