| Index: gdb/testsuite/gdb.python/py-symbol.exp
|
| diff --git a/gdb/testsuite/gdb.python/py-symbol.exp b/gdb/testsuite/gdb.python/py-symbol.exp
|
| index bc20ee471dbf8e25c13acc8fcc1c8bceb2419656..85ee5ff85aefe9aa99b5139abc5d8eaef99b2dc3 100644
|
| --- a/gdb/testsuite/gdb.python/py-symbol.exp
|
| +++ b/gdb/testsuite/gdb.python/py-symbol.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
|
| @@ -31,20 +31,20 @@ if { [skip_python_tests] } { continue }
|
| # point where we don't have a current frame, and we don't want to
|
| # require one.
|
| gdb_py_test_silent_cmd "python main_func = gdb.lookup_global_symbol(\"main\")" "Lookup main" 1
|
| -gdb_test "python print main_func.is_function" "True" "Test main_func.is_function"
|
| -gdb_test "python print gdb.lookup_global_symbol(\"junk\")" "None" "Test lookup_global_symbol(\"junk\")"
|
| +gdb_test "python print (main_func.is_function)" "True" "Test main_func.is_function"
|
| +gdb_test "python print (gdb.lookup_global_symbol(\"junk\"))" "None" "Test lookup_global_symbol(\"junk\")"
|
|
|
| -gdb_test "python print gdb.lookup_global_symbol('main').value()" "$hex .main." \
|
| +gdb_test "python print (gdb.lookup_global_symbol('main').value())" "$hex .main." \
|
| "print value of main"
|
|
|
| set qq_line [gdb_get_line_number "line of qq"]
|
| -gdb_test "python print gdb.lookup_global_symbol('qq').line" "$qq_line" \
|
| +gdb_test "python print (gdb.lookup_global_symbol('qq').line)" "$qq_line" \
|
| "print line number of qq"
|
|
|
| -gdb_test "python print gdb.lookup_global_symbol('qq').value()" "72" \
|
| +gdb_test "python print (gdb.lookup_global_symbol('qq').value())" "72" \
|
| "print value of qq"
|
|
|
| -gdb_test "python print gdb.lookup_global_symbol('qq').needs_frame" \
|
| +gdb_test "python print (gdb.lookup_global_symbol('qq').needs_frame)" \
|
| "False" \
|
| "print whether qq needs a frame"
|
|
|
| @@ -62,63 +62,69 @@ 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
|
|
|
| # Test is_argument attribute.
|
| -gdb_py_test_silent_cmd "python arg = gdb.lookup_symbol(\"arg\")" "Get variable a" 0
|
| -gdb_test "python print arg\[0\].is_variable" "False" "Test arg.is_variable"
|
| -gdb_test "python print arg\[0\].is_constant" "False" "Test arg.is_constant"
|
| -gdb_test "python print arg\[0\].is_argument" "True" "Test arg.is_argument"
|
| -gdb_test "python print arg\[0\].is_function" "False" "Test arg.is_function"
|
| +gdb_py_test_silent_cmd "python arg = gdb.lookup_symbol(\"arg\")" "Get variable arg" 0
|
| +gdb_test "python print (arg\[0\].is_variable)" "False" "Test arg.is_variable"
|
| +gdb_test "python print (arg\[0\].is_constant)" "False" "Test arg.is_constant"
|
| +gdb_test "python print (arg\[0\].is_argument)" "True" "Test arg.is_argument"
|
| +gdb_test "python print (arg\[0\].is_function)" "False" "Test arg.is_function"
|
|
|
| # Test is_function attribute.
|
| -gdb_py_test_silent_cmd "python func = frame.block().function" "Get block" 0
|
| -gdb_test "python print func.is_variable" "False" "Test func.is_variable"
|
| -gdb_test "python print func.is_constant" "False" "Test func.is_constant"
|
| -gdb_test "python print func.is_argument" "False" "Test func.is_argument"
|
| -gdb_test "python print func.is_function" "True" "Test func.is_function"
|
| -gdb_test "python print func.name" "func" "Test func.name"
|
| -gdb_test "python print func.print_name" "func" "Test func.print_name"
|
| -gdb_test "python print func.linkage_name" "func" "Test func.linkage_name"
|
| -gdb_test "python print func.addr_class == gdb.SYMBOL_LOC_BLOCK" "True" "Test func.addr_class"
|
| +gdb_py_test_silent_cmd "python func = block.function" "Get block function" 0
|
| +gdb_test "python print (func.is_variable)" "False" "Test func.is_variable"
|
| +gdb_test "python print (func.is_constant)" "False" "Test func.is_constant"
|
| +gdb_test "python print (func.is_argument)" "False" "Test func.is_argument"
|
| +gdb_test "python print (func.is_function)" "True" "Test func.is_function"
|
| +
|
| +# Test attributes of func.
|
| +gdb_test "python print (func.name)" "func" "Test func.name"
|
| +gdb_test "python print (func.print_name)" "func" "Test func.print_name"
|
| +gdb_test "python print (func.linkage_name)" "func" "Test func.linkage_name"
|
| +gdb_test "python print (func.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "Test func.addr_class"
|
|
|
| gdb_breakpoint [gdb_get_line_number "Break at end."]
|
| -gdb_continue_to_breakpoint "Break at end."
|
| +gdb_continue_to_breakpoint "Break at end for variable a" ".*Break at end.*"
|
| gdb_py_test_silent_cmd "python frame = gdb.selected_frame()" "Get Frame" 0
|
|
|
| # Test is_variable attribute.
|
| gdb_py_test_silent_cmd "python a = gdb.lookup_symbol(\'a\')" "Get variable a" 0
|
| -gdb_test "python print a\[0\].is_variable" "True" "Test a.is_variable"
|
| -gdb_test "python print a\[0\].is_constant" "False" "Test a.is_constant"
|
| -gdb_test "python print a\[0\].is_argument" "False" "Test a.is_argument"
|
| -gdb_test "python print a\[0\].is_function" "False" "Test a.is_function"
|
| -gdb_test "python print a\[0\].addr_class == gdb.SYMBOL_LOC_COMPUTED" "True" "Test a.addr_class"
|
| +gdb_test "python print (a\[0\].is_variable)" "True" "Test a.is_variable"
|
| +gdb_test "python print (a\[0\].is_constant)" "False" "Test a.is_constant"
|
| +gdb_test "python print (a\[0\].is_argument)" "False" "Test a.is_argument"
|
| +gdb_test "python print (a\[0\].is_function)" "False" "Test a.is_function"
|
|
|
| -gdb_test "python print a\[0\].value()" \
|
| +# Test attributes of a.
|
| +gdb_test "python print (a\[0\].addr_class == gdb.SYMBOL_LOC_COMPUTED)" "True" "Test a.addr_class"
|
| +
|
| +gdb_test "python print (a\[0\].value())" \
|
| "symbol requires a frame to compute its value.*"\
|
| "try to print value of a without a frame"
|
| -gdb_test "python print a\[0\].value(frame)" "0" \
|
| +gdb_test "python print (a\[0\].value(frame))" "0" \
|
| "print value of a"
|
| -gdb_test "python print a\[0\].needs_frame" "True" \
|
| +gdb_test "python print (a\[0\].needs_frame)" "True" \
|
| "print whether a needs a frame"
|
|
|
| # Test is_constant attribute
|
| -gdb_py_test_silent_cmd "python t = gdb.lookup_symbol(\"one\")" "Get variable a" 0
|
| -gdb_test "python print t\[0\].is_variable" "False" "Test t.is_variable"
|
| -gdb_test "python print t\[0\].is_constant" "True" "Test t.is_constant"
|
| -gdb_test "python print t\[0\].is_argument" "False" "Test t.is_argument"
|
| -gdb_test "python print t\[0\].is_function" "False" "Test t.is_function"
|
| -gdb_test "python print t\[0\].addr_class == gdb.SYMBOL_LOC_CONST" "True" "Test t.addr_class"
|
| +gdb_py_test_silent_cmd "python t = gdb.lookup_symbol(\"one\")" "Get constant t" 0
|
| +gdb_test "python print (t\[0\].is_variable)" "False" "Test t.is_variable"
|
| +gdb_test "python print (t\[0\].is_constant)" "True" "Test t.is_constant"
|
| +gdb_test "python print (t\[0\].is_argument)" "False" "Test t.is_argument"
|
| +gdb_test "python print (t\[0\].is_function)" "False" "Test t.is_function"
|
| +
|
| +# Test attributes of t.
|
| +gdb_test "python print (t\[0\].addr_class == gdb.SYMBOL_LOC_CONST)" "True" "Test t.addr_class"
|
|
|
| # Test type attribute.
|
| -gdb_test "python print t\[0\].type" "enum tag" "Get type"
|
| +gdb_test "python print (t\[0\].type)" "enum tag" "Get type"
|
|
|
| # Test symtab attribute.
|
| -gdb_test "python print t\[0\].symtab" "gdb.python/py-symbol.c.*" "Get symtab"
|
| +gdb_test "python print (t\[0\].symtab)" "gdb.python/py-symbol.c.*" "Get symtab"
|
|
|
| # C++ tests
|
| # Recompile binary.
|
| - if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" executable "debug c++"] != "" } {
|
| - untested "Couldn't compile ${srcfile} in c++ mode"
|
| - return -1
|
| - }
|
| +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" executable "debug c++"] != "" } {
|
| + untested "Couldn't compile ${srcfile} in c++ mode"
|
| + return -1
|
| +}
|
|
|
| # Start with a fresh gdb.
|
| gdb_exit
|
| @@ -134,16 +140,22 @@ if ![runto_main] then {
|
| gdb_breakpoint [gdb_get_line_number "Break in class."]
|
| gdb_continue_to_breakpoint "Break in class."
|
|
|
| -gdb_py_test_silent_cmd "python cplusframe = gdb.selected_frame()" "Get Frame" 0
|
| -gdb_py_test_silent_cmd "python cplusfunc = cplusframe.block().function" "Get block" 0
|
| -gdb_test "python print cplusfunc.is_variable" "False" "Test func.is_variable"
|
| -gdb_test "python print cplusfunc.is_constant" "False" "Test func.is_constant"
|
| -gdb_test "python print cplusfunc.is_argument" "False" "Test func.is_argument"
|
| -gdb_test "python print cplusfunc.is_function" "True" "Test func.is_function"
|
| -gdb_test "python print cplusfunc.name" "SimpleClass::valueofi().*" "Test func.name"
|
| -gdb_test "python print cplusfunc.print_name" "SimpleClass::valueofi().*" "Test func.print_name"
|
| -gdb_test "python print cplusfunc.linkage_name" "SimpleClass::valueofi().*" "Test func.linkage_name"
|
| -gdb_test "python print cplusfunc.addr_class == gdb.SYMBOL_LOC_BLOCK" "True" "Test func.addr_class"
|
| +gdb_py_test_silent_cmd "python cplusframe = gdb.selected_frame()" "Get Frame at class" 0
|
| +gdb_py_test_silent_cmd "python cplusfunc = cplusframe.block().function" "Get function at class" 0
|
| +
|
| +gdb_test "python print (cplusfunc.is_variable)" \
|
| + "False" "Test cplusfunc.is_variable"
|
| +gdb_test "python print (cplusfunc.is_constant)" \
|
| + "False" "Test cplusfunc.is_constant"
|
| +gdb_test "python print (cplusfunc.is_argument)" \
|
| + "False" "Test cplusfunc.is_argument"
|
| +gdb_test "python print (cplusfunc.is_function)" \
|
| + "True" "Test cplusfunc.is_function"
|
| +
|
| +gdb_test "python print (cplusfunc.name)" "SimpleClass::valueofi().*" "Test method.name"
|
| +gdb_test "python print (cplusfunc.print_name)" "SimpleClass::valueofi().*" "Test method.print_name"
|
| +gdb_test "python print (cplusfunc.linkage_name)" "SimpleClass::valueofi().*" "Test method.linkage_name"
|
| +gdb_test "python print (cplusfunc.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "Test method.addr_class"
|
|
|
| # Test is_valid when the objfile is unloaded. This must be the last
|
| # test as it unloads the object file in GDB.
|
| @@ -153,10 +165,12 @@ if ![runto_main] then {
|
| fail "Cannot run to main."
|
| return 0
|
| }
|
| +
|
| gdb_breakpoint [gdb_get_line_number "Break at end."]
|
| -gdb_continue_to_breakpoint "Break at end."
|
| +gdb_continue_to_breakpoint "Break at end for symbol validity" ".*Break at end.*"
|
| gdb_py_test_silent_cmd "python a = gdb.lookup_symbol(\'a\')" "Get variable a" 0
|
| -gdb_test "python print a\[0\].is_valid()" "True" "Test symbol validity"
|
| +gdb_test "python print (a\[0\].is_valid())" "True" "Test symbol validity"
|
| delete_breakpoints
|
| gdb_unload
|
| -gdb_test "python print a\[0\].is_valid()" "False" "Test symbol validity"
|
| +gdb_test "python print (a\[0\].is_valid())" "False" "Test symbol non-validity"
|
| +gdb_test_no_output "python a = None" "Test symbol destructor"
|
|
|