gdb: move displaced stepping logic to gdbarch, allow starting concurrent displaced...

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.arch / gdb1558.exp

diff --git a/gdb/testsuite/gdb.arch/gdb1558.exp b/gdb/testsuite/gdb.arch/gdb1558.exp
index 42bb277379bea9e24e7273fca2610a1f511b988f..47b64cf6b3991e728ee6fdf8220aaae2b9fecf9e 100644 (file)
--- a/gdb/testsuite/gdb.arch/gdb1558.exp
+++ b/gdb/testsuite/gdb.arch/gdb1558.exp
@@ -1,4 +1,4 @@
-# Copyright 2004-2014 Free Software Foundation, Inc.
+# Copyright 2004-2020 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
@@ -32,7 +32,7 @@ set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 # Note we have to compile WITH optimization and WITHOUT debugging information to expose the bug.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {"additional_flags=-O2"}] != "" } {
-    untested gdb1558.exp
+    untested "failed to compile"
     return -1
 }
 
@@ -50,17 +50,12 @@ gdb_test "b sub2" "Breakpoint 3.*" "set breakpoint at sub2"
 
 gdb_run_cmd
 
-gdb_expect 30 {
+set test "hits breakpoint at main after function called from main"
+gdb_test_multiple "" $test {
     -re "Breakpoint 1.*main .*$gdb_prompt $" {
-       pass "Hits breakpoint at main after function called from main"
+       pass $test
     }
     -re "Breakpoint 2.*sub1 .*$gdb_prompt $" {
-       kfail "gdb/1558" "Hits breakpoint at main after function called from main"
-    }
-    -re "$gdb_prompt $" { 
-       fail "Hits breakpoint at main after function called from main"
-    }
-    timeout { 
-       fail "Hits breakpoint at main after function called from main (timeout)"
+       kfail "gdb/1558" $test
     }
 }