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

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.arch / amd64-disp-step-avx.exp

diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
index fe6eb6729be2add082ee29f5217720d46e402d67..4888bf408cc44f1017fa3317bb00e1977a7ca3dc 100644 (file)
--- a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
@@ -1,4 +1,4 @@
-# Copyright 2009-2018 Free Software Foundation, Inc.
+# Copyright 2009-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
@@ -78,11 +78,9 @@ proc disp_step_func { func } {
     set test_end_label "${func}_end"
 
     gdb_test "break ${test_start_label}" \
-       "Breakpoint.*at.* file .*$srcfile, line.*" \
-       "break ${test_start_label}"
+       "Breakpoint.*at.* file .*$srcfile, line.*"
     gdb_test "break ${test_end_label}" \
-       "Breakpoint.*at.* file .*$srcfile, line.*" \
-       "break ${test_end_label}"
+       "Breakpoint.*at.* file .*$srcfile, line.*"
 
     gdb_test "continue" \
        "Continuing.*Breakpoint.*, ${test_start_label} ().*" \
@@ -94,10 +92,16 @@ proc disp_step_func { func } {
     set value "0xdeadbeefd3adb33f"
     set_regs $value
 
+    # Turn "debug displaced" on to make sure a displaced step is actually
+    # executed, not an inline step.
+    gdb_test_no_output "set debug displaced on"
+
     gdb_test "continue" \
-       "Continuing.*Breakpoint.*, ${test_end_label} ().*" \
+       "Continuing.*displaced: prepared successfully.*Breakpoint.*, ${test_end_label} ().*" \
        "continue to ${test_end_label}"
 
+    gdb_test_no_output "set debug displaced off"
+
     verify_regs $value
 }