[binutils-gdb] [spu] Some additional test fixes

[Ulrich Weigand <uweigand at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6f14765f9f448bbe03750634eb42c4a9db6521b8

commit 6f14765f9f448bbe03750634eb42c4a9db6521b8
Author: Ulrich Weigand <ulrich.weigand@de.ibm.com>
Date:   Thu Nov 30 18:35:54 2017 +0100

    [spu] Some additional test fixes
    
    Now that the ppc64 breakpoint regression is fixed, running the
    gdb.cell test suite showed a few more test case problems, caused
    by tests that haven't been updated to adapt to GDB changes.
    
    gdb/testsuite/ChangeLog:
    2017-11-30  Ulrich Weigand  <uweigand@de.ibm.com>
    
    	* gdb.cell/gcore.exp: Fix typo when setting spu_bin.
    	Update for changed thread numbering.
    	* gdb.cell/bt.exp: Update for changed GDB output.

Diff:
---
 gdb/testsuite/ChangeLog          | 6 ++++++
 gdb/testsuite/gdb.cell/bt.exp    | 2 +-
 gdb/testsuite/gdb.cell/gcore.exp | 5 ++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c1cd966..e95d9f6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-30  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* gdb.cell/gcore.exp: Fix typo when setting spu_bin.
+	Update for changed thread numbering.
+	* gdb.cell/bt.exp: Update for changed GDB output.
+
 2017-11-30  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* boards/cc-with-tweaks.exp: Include local-board.exp instead of
diff --git a/gdb/testsuite/gdb.cell/bt.exp b/gdb/testsuite/gdb.cell/bt.exp
index b48fe9b..6aa300d 100644
--- a/gdb/testsuite/gdb.cell/bt.exp
+++ b/gdb/testsuite/gdb.cell/bt.exp
@@ -73,7 +73,7 @@ if ![runto_main] then {
 }
 
 delete_breakpoints
-gdb_test "continue" ".*Program received signal SIGABRT, Aborted.*"
+gdb_test "continue" ".*received signal SIGABRT, Aborted.*"
 
 gdb_test "backtrace" ".*abort.*crash_handler.*base.*offset.*<cross-architecture call>.*main.*speid.*argp.*envp.*at.*$spu2_file.c.*<cross-architecture call>.*spe_context_run.*indirect_handler.*base.*offset.*<cross-architecture call>.*main.*speid.*argp.*envp.*at.*$spu_file.c.*<cross-architecture call>.*spe_context_run.*spe_thread.*at.*$ppu_file.c.*"
 
diff --git a/gdb/testsuite/gdb.cell/gcore.exp b/gdb/testsuite/gdb.cell/gcore.exp
index efed4bb..db40326 100644
--- a/gdb/testsuite/gdb.cell/gcore.exp
+++ b/gdb/testsuite/gdb.cell/gcore.exp
@@ -26,7 +26,7 @@ set ppu_src ${srcdir}/${subdir}/${ppu_file}.c
 set ppu_bin [standard_output_file ${ppu_file}]
 set spu_file "coremaker-spu"
 set spu_src ${srcdir}/${subdir}/${spu_file}.c
-set spu_bin [standard_output_file ${ppu_file}]
+set spu_bin [standard_output_file ${spu_file}]
 
 if {![isnative]} then {
     return 0
@@ -92,10 +92,9 @@ gdb_expect {
     timeout			{ fail "(timeout) core-file command" }
 }
 
-gdb_test "t 6" "Switching to thread 6.*"
 gdb_test "backtrace" ".*abort.*main.*at.*$ppu_file.c.*"
 
-for {set thread_id 1} {$thread_id < 6} {incr thread_id} {
+for {set thread_id 2} {$thread_id < 7} {incr thread_id} {
   gdb_test "t $thread_id" \
            "Switching to thread $thread_id.*" \
            "switch to thread $thread_id"