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

[binutils-gdb.git] / gdb / testsuite / gdb.python / py-block.exp

diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp
index 45e4f072382e1996e46beeb5175665dbde912982..fdb7c097e207e3b5027eeb86f30c26210b7937e2 100644 (file)
--- a/gdb/testsuite/gdb.python/py-block.exp
+++ b/gdb/testsuite/gdb.python/py-block.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2016 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
@@ -20,7 +20,7 @@ load_lib gdb-python.exp
 
 standard_testfile
 
-if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
+if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
     return -1
 }
 
@@ -38,26 +38,35 @@ 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_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"
-gdb_test "python print (block.end)" "${decimal}" "Check end not None"
+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"
+gdb_test "python print (block.end)" "${decimal}" "check end not None"
+gdb_test "python print (block\['f'\].name == 'f')" "True" "check variable access"
+gdb_test "python print (block\['nonexistent'\])" ".*KeyError: 'nonexistent'.*" \
+         "check nonexistent variable"
+gdb_test "python print (block\[42\])" ".*TypeError: Expected a string.*" \
+         "check non-string key"
 
 # 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_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_test "python print (gblock.is_global)" "True" "Is the global block"
-gdb_test "python print (sblock.is_static)" "True" "Is the static block"
+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, 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"
 
 # Move up superblock(s) until we reach function block_func.
-gdb_test_no_output "python block = block.superblock" "Get superblock"
-gdb_test "python print (block.function)" "None" "Second anonymous block"
-gdb_test_no_output "python block = block.superblock" "Get superblock 2"
+gdb_test_no_output "python block = block.superblock" "get superblock"
+gdb_test "python print (block.function)" "None" "second anonymous block"
+gdb_test_no_output "python block = block.superblock" "get superblock 2"
 gdb_test "python print (block.function)" "block_func" \
          "Print superblock 2 function"
 
@@ -79,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"