| Index: 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 745f84468d25735d55b9db2cbe21927755f9b4e9..138ca3d110228adaefc6a8c4ec748e9c0bd2f2ee 100644
|
| --- a/gdb/testsuite/gdb.python/py-block.exp
|
| +++ b/gdb/testsuite/gdb.python/py-block.exp
|
| @@ -1,4 +1,4 @@
|
| -# Copyright (C) 2010-2012 Free Software Foundation, Inc.
|
| +# Copyright (C) 2010-2013 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
|
| @@ -39,35 +39,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_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"
|
|
|
| # 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_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_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 "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" \
|
| +gdb_test "python print (block.function)" "block_func" \
|
| "Print superblock 2 function"
|
|
|
| # Switch frames, then test for main block.
|
| gdb_test "up" ".*"
|
| gdb_py_test_silent_cmd "python frame = gdb.selected_frame()" "Get Frame 2" 0
|
| gdb_py_test_silent_cmd "python block = frame.block()" "Get Frame 2's block" 0
|
| -gdb_test "python print block" "<gdb.Block object at $hex>" \
|
| +gdb_test "python print (block)" "<gdb.Block object at $hex>" \
|
| "Check Frame 2's block not None"
|
| -gdb_test "python print block.function" "main" "main block"
|
| +gdb_test "python print (block.function)" "main" "main block"
|
|
|
|
|
| # Test Block is_valid. This must always be the last test in this
|
| @@ -76,12 +76,12 @@ delete_breakpoints
|
| gdb_py_test_silent_cmd "python frame = gdb.selected_frame()" "Get Frame" 0
|
| gdb_py_test_silent_cmd "python block = frame.block()" "Get Frame block" 0
|
| gdb_py_test_silent_cmd "python block_iter = iter (block)" "Get Frame block" 0
|
| -gdb_test "python print block.is_valid()" "True" \
|
| +gdb_test "python print (block.is_valid())" "True" \
|
| "Check block validity"
|
| -gdb_test "python print block_iter.is_valid()" "True" \
|
| +gdb_test "python print (block_iter.is_valid())" "True" \
|
| "Check block validity"
|
| gdb_unload
|
| -gdb_test "python print block.is_valid()" "False" \
|
| +gdb_test "python print (block.is_valid())" "False" \
|
| "Check block validity"
|
| -gdb_test "python print block_iter.is_valid()" "False" \
|
| +gdb_test "python print (block_iter.is_valid())" "False" \
|
| "Check block validity"
|
|
|