diff mbox series

[2/4] gdb/testsuite: fix gdb.reverse/solib-*.exp tests when using clang

Message ID 20230725095833.236804-3-blarsen@redhat.com
State New
Headers
Series Many fixes to gdb.reverse tests |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm success Testing passed

Commit Message

Guinevere Larsen July 25, 2023, 9:58 a.m. UTC 
  The tests gdb.reverse/solib-precsave.exp and solib-reverse.exp have the
assumption that line tables will have an entry for the closing } in a
function. Not all compiles do this, one example being clang. To fix
this, this commit changes the function in shr2.c to have multiple lines,
and the test to accept either line as a correct step location.

To properly re-sync the inferiors, the function repeat_cmd_until had to
be slightly changed to work with empty "current locations", so that we
are able to step through multiple lines.

This also changes the annotations used to determine the breakpoint
locations in solib-reverse.c, adding a NOP right before the return
statement. This way GDB will not set a breakpoint in the closing } line.
---
 gdb/testsuite/gdb.reverse/shr2.c             |  3 ++-
 gdb/testsuite/gdb.reverse/solib-precsave.exp | 24 ++++++++++++++++----
 gdb/testsuite/gdb.reverse/solib-reverse.c    |  5 ++--
 gdb/testsuite/gdb.reverse/solib-reverse.exp  | 24 ++++++++++++++++----
 gdb/testsuite/lib/gdb.exp                    |  6 ++---
 5 files changed, 48 insertions(+), 14 deletions(-)

Comments

Tom Tromey July 26, 2023, 1:37 p.m. UTC | #1 
>>>>> "Bruno" == Bruno Larsen via Gdb-patches <gdb-patches@sourceware.org> writes:

Bruno> diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.c b/gdb/testsuite/gdb.reverse/solib-reverse.c
Bruno> index 7aa60089df3..f8c98f2ab94 100644
Bruno> --- a/gdb/testsuite/gdb.reverse/solib-reverse.c
Bruno> +++ b/gdb/testsuite/gdb.reverse/solib-reverse.c
Bruno> @@ -43,6 +43,7 @@ int main ()
Bruno>    shr1 ("message 2\n");		/* shr1 two */
Bruno>    shr1 ("message 3\n");		/* shr1 three */
 
Bruno> -  return 0;			/* end part one */
Bruno> -} /* end of main */
Bruno> +  asm("nop");			/* end part one */
Bruno> +  return 0; /* end of main */

I suspect it would be better to use something other than 'asm' here,
like an assignment to some global or something like that.

Tom
diff mbox series

Patch

diff --git a/gdb/testsuite/gdb.reverse/shr2.c b/gdb/testsuite/gdb.reverse/shr2.c
index 84a03de1b8c..16c3bf3bc6c 100644
--- a/gdb/testsuite/gdb.reverse/shr2.c
+++ b/gdb/testsuite/gdb.reverse/shr2.c
@@ -19,7 +19,8 @@ 
 
 int shr2(int x)
 {
-  return 2*x;
+  int y = 2*x;
+  return y;
 }
 
 int shr2_local(int x)
diff --git a/gdb/testsuite/gdb.reverse/solib-precsave.exp b/gdb/testsuite/gdb.reverse/solib-precsave.exp
index 3ca73828063..f89969222c6 100644
--- a/gdb/testsuite/gdb.reverse/solib-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/solib-precsave.exp
@@ -140,8 +140,17 @@  gdb_test_multiple "reverse-step" "reverse-step into solib function one" {
 	pass $gdb_test_name
     }
 }
-gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function one"
-gdb_test "reverse-step" " middle part two.*" "reverse-step back to main one"
+# Depending on wether the closing } has a line associated, we might have
+# different acceptable results here
+gdb_test_multiple "reverse-step" "reverse-step within solib function one" {
+    -re -wrap "return y;.*" {
+	pass $gdb_test_name
+    }
+    -re -wrap "int y =.*" {
+	pass $gdb_test_name
+    }
+}
+repeat_cmd_until "reverse-step" "" "main .. at" "reverse-step back to main one"
 
 gdb_test_multiple "reverse-step" "reverse-step into solib function two" {
     -re -wrap "begin part two.*" {
@@ -152,8 +161,15 @@  gdb_test_multiple "reverse-step" "reverse-step into solib function two" {
 	pass $gdb_test_name
     }
 }
-gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function two"
-gdb_test "reverse-step" " begin part two.*" "reverse-step back to main two"
+gdb_test_multiple "reverse-step" "reverse-step within solib function two" {
+    -re -wrap "return y;.*" {
+	pass $gdb_test_name
+    }
+    -re -wrap "int y =.*" {
+	pass $gdb_test_name
+    }
+}
+repeat_cmd_until "reverse-step" "" "main .. at" "reverse-step back to main two"
 
 #
 # Test reverse-next over debuggable solib function
diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.c b/gdb/testsuite/gdb.reverse/solib-reverse.c
index 7aa60089df3..f8c98f2ab94 100644
--- a/gdb/testsuite/gdb.reverse/solib-reverse.c
+++ b/gdb/testsuite/gdb.reverse/solib-reverse.c
@@ -43,6 +43,7 @@  int main ()
   shr1 ("message 2\n");		/* shr1 two */
   shr1 ("message 3\n");		/* shr1 three */
 
-  return 0;			/* end part one */
-} /* end of main */
+  asm("nop");			/* end part one */
+  return 0; /* end of main */
+}
 
diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.exp b/gdb/testsuite/gdb.reverse/solib-reverse.exp
index c061086a8d7..afc4659184a 100644
--- a/gdb/testsuite/gdb.reverse/solib-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/solib-reverse.exp
@@ -116,8 +116,17 @@  gdb_test_multiple "reverse-step" "reverse-step into solib function one" {
 	pass $gdb_test_name
     }
 }
-gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function one"
-gdb_test "reverse-step" " middle part two.*" "reverse-step back to main one"
+# Depending on wether the closing } has a line associated, we might have
+# different acceptable results here
+gdb_test_multiple "reverse-step" "reverse-step within solib function one" {
+    -re -wrap "return y;.*" {
+	pass $gdb_test_name
+    }
+    -re -wrap "int y =.*" {
+	pass $gdb_test_name
+    }
+}
+repeat_cmd_until "reverse-step" "" "main .. at" "reverse-step back to main one"
 
 gdb_test_multiple "reverse-step" "reverse-step into solib function two" {
     -re -wrap "begin part two.*" {
@@ -128,8 +137,15 @@  gdb_test_multiple "reverse-step" "reverse-step into solib function two" {
 	pass $gdb_test_name
     }
 }
-gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function two"
-gdb_test "reverse-step" " begin part two.*" "reverse-step back to main two"
+gdb_test_multiple "reverse-step" "reverse-step within solib function two" {
+    -re -wrap "return y;.*" {
+	pass $gdb_test_name
+    }
+    -re -wrap "int y =.*" {
+	pass $gdb_test_name
+    }
+}
+repeat_cmd_until "reverse-step" "" "main .. at" "reverse-step back to main two"
 
 #
 # Test reverse-next over debuggable solib function
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 66c04a2efe2..63b6291fc36 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -9679,6 +9679,9 @@  proc repeat_cmd_until { command current target \
 
     set count 0
     gdb_test_multiple "$command" "$test_name" {
+	-re "$target.*$gdb_prompt $" {
+	    pass "$test_name"
+	}
 	-re "$current.*$gdb_prompt $" {
 	    incr count
 	    if { $count < $max_steps } {
@@ -9688,9 +9691,6 @@  proc repeat_cmd_until { command current target \
 		fail "$test_name"
 	    }
 	}
-	-re "$target.*$gdb_prompt $" {
-	    pass "$test_name"
-	}
     }
 }