From a69b7d9d9622c4e238978449762097a216f55b8b Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Thu, 12 Nov 2009 19:59:28 +0000 Subject: [PATCH] testsuite/ * lib/cell.exp (skip_cell_tests): Clean up test files before returning. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/lib/cell.exp | 15 ++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index aed26c8..4296099 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2009-11-12 Daniel Jacobowitz + * lib/cell.exp (skip_cell_tests): Clean up test files before + returning. + +2009-11-12 Daniel Jacobowitz + * lib/gdb.exp (gdb_test_multiple): Handle "y or [n]", "[y] or n", and the breakpoint menu. Do not call perror if a prompt is seen. Consume the following GDB prompt. diff --git a/gdb/testsuite/lib/cell.exp b/gdb/testsuite/lib/cell.exp index 18291c7..0d63dde 100644 --- a/gdb/testsuite/lib/cell.exp +++ b/gdb/testsuite/lib/cell.exp @@ -106,23 +106,28 @@ proc skip_cell_tests {} { verbose "$me: compiling testfile $src" 2 set compile_flags {debug nowarnings quiet} + set skip 0 if { [gdb_compile_cell_spu $src_spu $exe_spu executable $compile_flags] != "" } { verbose "$me: compiling spu binary failed, returning 1" 2 - return [set skip_cell_tests_saved 1] + set skip 1 } - if { [gdb_cell_embedspu $exe_spu $exe_spu-embed.o $compile_flags] != "" } { + if { ! $skip && [gdb_cell_embedspu $exe_spu $exe_spu-embed.o $compile_flags] != "" } { verbose "$me: embedding spu binary failed, returning 1" 2 - return [set skip_cell_tests_saved 1] + set skip 1 } - if { [gdb_compile_cell_ppu [list $src $exe_spu-embed.o] $exe executable $compile_flags] != "" } { + if { ! $skip && [gdb_compile_cell_ppu [list $src $exe_spu-embed.o] $exe executable $compile_flags] != "" } { verbose "$me: compiling ppu binary failed, returning 1" 2 - return [set skip_cell_tests_saved 1] + set skip 1 } file delete $src file delete $src_spu file delete $exe_spu file delete $exe_spu-embed.o + if { $skip } { + return [set skip_cell_tests_saved 1] + } + # Compilation succeeded so now run it via gdb. gdb_exit -- 2.7.4