fix erroneous error-handling in frame filter code

[deliverable/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 c1ea2507e17cc9d5a48f1332d8f2e007483c8e58..9cc5a849fbda717d65c6cc40a16bd7310787f020 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 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 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
@@ -16,35 +16,14 @@
 # This file is part of the GDB testsuite.  It tests the mechanism
 # exposing values to Python.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set testfile "py-block"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
-    return -1
-}
+load_lib gdb-python.exp
 
-# Run a command in GDB, and report a failure if a Python exception is thrown.
-# If report_pass is true, report a pass if no exception is thrown.
-proc gdb_py_test_silent_cmd {cmd name report_pass} {
-    global gdb_prompt
+standard_testfile
 
-  gdb_test_multiple $cmd $name {
-      -re "Traceback.*$gdb_prompt $"  { fail $name }
-      -re "$gdb_prompt $"            { if $report_pass { pass $name } }
-  }
+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
+    return -1
 }
 
-# Start with a fresh gdb.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
@@ -60,20 +39,49 @@ 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_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"
 
 # Move up superblock(s) until we reach function block_func.
-gdb_test "python block = block.superblock" "" "Get superblock"
-gdb_test "python print block.function" "None" "Second anonymous block"
-gdb_test "python block = block.superblock" "" "Get superblock"
-gdb_test "python print block.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 "python print (block.function)" "block_func" \
+         "Print superblock 2 function"
 
 # Switch frames, then test for main block.
-gdb_test "up" ""
+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>" \
+         "Check Frame 2's block not None"
+gdb_test "python print (block.function)" "main" "main block"
+
+
+# Test Block is_valid.  This must always be the last test in this
+# testcase as it unloads the object file.
+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 block" 0
-gdb_test "python print block" "<gdb.Block object at $hex>" "Check block not None"
-gdb_test "python print block.function" "main" "main block"
+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" \
+         "Check block validity"
+gdb_test "python print (block_iter.is_valid())" "True" \
+         "Check block validity"
+gdb_unload
+gdb_test "python print (block.is_valid())" "False" \
+         "Check block validity"
+gdb_test "python print (block_iter.is_valid())" "False" \
+         "Check block validity"