Remove a spurious target_terminal::ours() from windows_nat_target::wait()

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.cell / break.exp

diff --git a/gdb/testsuite/gdb.cell/break.exp b/gdb/testsuite/gdb.cell/break.exp
index ed022f16b297e2d3553f3b1927a5a59af35cd68b..8b737de5690a2bb80d9a0f3990fa1255b2c86d49 100644 (file)
--- a/gdb/testsuite/gdb.cell/break.exp
+++ b/gdb/testsuite/gdb.cell/break.exp
@@ -1,4 +1,4 @@
-# Copyright 2009, 2011 Free Software Foundation, Inc.
+# Copyright 2009-2018 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
@@ -23,10 +23,10 @@ load_lib cell.exp
 set testfile "break"
 set ppu_file "break"
 set ppu_src ${srcdir}/${subdir}/${ppu_file}.c
-set ppu_bin ${objdir}/${subdir}/${ppu_file}
+set ppu_bin [standard_output_file ${ppu_file}]
 set spu_file "break-spu"
 set spu_src ${srcdir}/${subdir}/${spu_file}.c
-set spu_bin ${objdir}/${subdir}/${spu_file}
+set spu_bin [standard_output_file ${spu_file}]
 
 if {[skip_cell_tests]} {
     return 0
@@ -34,20 +34,20 @@ if {[skip_cell_tests]} {
 
 # Compile SPU binary.
 if { [gdb_compile_cell_spu $spu_src $spu_bin executable {debug}]  != "" } {
-  unsupported "Compiling spu binary failed."
+  unsupported "compiling spu binary failed."
   return -1
 }
 # Compile PPU binary.
 if { [gdb_cell_embedspu $spu_bin $spu_bin-embed.o {debug}]  != "" } {
-  unsupported "Embedding spu binary failed."
+  unsupported "embedding spu binary failed."
   return -1
 }
 if { [gdb_compile_cell_ppu [list $ppu_src $spu_bin-embed.o] $ppu_bin executable {debug}] != "" } {
-  unsupported "Compiling ppu binary failed."
+  unsupported "compiling ppu binary failed."
   return -1
 }
 
-if [get_compiler_info ${ppu_bin}] {
+if [get_compiler_info] {
   return -1
 }
 
@@ -60,14 +60,14 @@ gdb_load ${ppu_bin}
 # shouldn't prompt for anything.
 gdb_test "delete breakpoints" \
         "" \
-        "No prompt when deleting non-existing breakpoints"
+        "no prompt when deleting non-existing breakpoints"
 
 gdb_test "break main" \
         "Breakpoint.*at.* file .*$testfile.c, line.*" \
         "breakpoint main in ppu"
 
 if ![runto_main] then {
-  fail "Can't run to main"
+  fail "can't run to main"
   return 0
 }
 
@@ -84,7 +84,7 @@ gdb_expect {
   -re ".*$spu_file.c.*Make breakpoint pending.*y or \\\[n\\\]. $" {
     gdb_test "y" "Breakpoint.*$spu_file.*pending." "set pending breakpoint"
   }
-  timeout { fail "Timeout while setting breakpoint in spu binary" }
+  timeout { fail "timeout while setting breakpoint in spu binary" }
 }
 
 # Check breakpoints.