gdb/testsuite: make test names unique in gdb.python/py-block.exp

Extend some test names to make them unique.

gdb/testsuite/ChangeLog:

	* gdb.python/py-block.exp: Give tests unique names.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 91ac3a66fd5186f35cfd2274a8751d7fc4827a91..7ee89f1ced98907435b4abe57dc972d7faab2a95 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2021-03-12  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * gdb.python/py-block.exp: Give tests unique names.
+
 2021-03-12  Andrew Burgess  <andrew.burgess@embecosm.com>
 
        * gdb.python/py-pp-maint.exp: Extend test names to make them

diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp
index c9da474debc71abb6e4898d69e508dd977a1df21..fdb7c097e207e3b5027eeb86f30c26210b7937e2 100644 (file)
--- a/gdb/testsuite/gdb.python/py-block.exp
+++ b/gdb/testsuite/gdb.python/py-block.exp
@@ -38,7 +38,8 @@ gdb_continue_to_breakpoint "Block break here."
 
 # Test initial innermost block.
 gdb_py_test_silent_cmd "python frame = gdb.selected_frame()" "Get Frame" 0
-gdb_py_test_silent_cmd "python block = frame.block()" "Get block" 0
+gdb_py_test_silent_cmd "python block = frame.block()" \
+    "Get block, initial innermost block" 0
 gdb_test "python print (block)" "<gdb.Block object at $hex>" "check block not None"
 gdb_test "python print (block.function)" "None" "first anonymous block"
 gdb_test "python print (block.start)" "${decimal}" "check start not None"
@@ -51,11 +52,14 @@ gdb_test "python print (block\[42\])" ".*TypeError: Expected a string.*" \
 
 # Test global/static blocks
 gdb_py_test_silent_cmd "python frame = gdb.selected_frame()" "Get Frame" 0
-gdb_py_test_silent_cmd "python block = frame.block()" "Get block" 0
+gdb_py_test_silent_cmd "python block = frame.block()" \
+    "Get block, frame.block" 0
 gdb_test "python print (block.is_global)" "False" "not a global block"
 gdb_test "python print (block.is_static)" "False" "not a static block"
-gdb_py_test_silent_cmd "python gblock = block.global_block" "Get block" 1
-gdb_py_test_silent_cmd "python sblock = block.static_block" "Get block" 1
+gdb_py_test_silent_cmd "python gblock = block.global_block" \
+    "Get block, global_block" 1
+gdb_py_test_silent_cmd "python sblock = block.static_block" \
+    "Get block, static_block" 1
 gdb_test "python print (gblock.is_global)" "True" "is the global block"
 gdb_test "python print (sblock.is_static)" "True" "is the static block"
 
@@ -84,9 +88,9 @@ gdb_py_test_silent_cmd "python block_iter = iter (block)" "Get Frame block" 0
 gdb_test "python print (block.is_valid())" "True" \
          "Check block validity"
 gdb_test "python print (block_iter.is_valid())" "True" \
-         "Check block validity"
+         "Check block_iter validity"
 gdb_unload
 gdb_test "python print (block.is_valid())" "False" \
-         "Check block validity"
+         "Check block validity after unload"
 gdb_test "python print (block_iter.is_valid())" "False" \
-         "Check block validity"
+         "Check block_iter validity after unload"