Patchwork [spu] Some additional test fixes

login
register
mail settings
Submitter Ulrich Weigand
Date Nov. 30, 2017, 5:39 p.m.
Message ID <20171130173928.271A1D80125@oc3748833570.ibm.com>
Download mbox | patch
Permalink /patch/24639/
State New
Headers show

Comments

Ulrich Weigand - Nov. 30, 2017, 5:39 p.m.
Hello,

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.

Tested on Cell/B.E., pushed to mainline.

Bye,
Ulrich
    
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.

Patch

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"