OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix prints in tests for Python 3 

Python 3's print requires to use parentheses, so this patch adds them
where they were missing.

gdb/testsuite/ChangeLog:

	* gdb.ada/py_range.exp: Add parentheses to calls to print.
	* gdb.dwarf2/symtab-producer.exp: Same.
	* gdb.gdb/python-interrupts.exp: Same.
	* gdb.gdb/python-selftest.exp: Same.
	* gdb.python/py-linetable.exp: Same.
	* gdb.python/py-type.exp: Same.
	* gdb.python/py-value-cc.exp: Same.
	* gdb.python/py-value.exp: Same.
This commit is contained in:
Simon Marchi 2014-11-28 11:18:48 -05:00
parent 57df9adf2d
commit d7fc3181f7
9 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,14 @@
2014-11-28 Simon Marchi <simon.marchi@ericsson.com>
* gdb.ada/py_range.exp: Add parentheses to python calls to print.
* gdb.dwarf2/symtab-producer.exp: Same.
* gdb.gdb/python-interrupts.exp: Same.
* gdb.gdb/python-selftest.exp: Same.
* gdb.python/py-linetable.exp: Same.
* gdb.python/py-type.exp: Same.
* gdb.python/py-value-cc.exp: Same.
* gdb.python/py-value.exp: Same.
2014-11-28 Yao Qi <yao@codesourcery.com>
* gdb.base/break-probes.exp: Match library name prefixed with

6
gdb/testsuite/gdb.ada/py_range.exp
View File

@ -30,11 +30,11 @@ if { [skip_python_tests] } { continue }
set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
runto "foo.adb:$bp_location"
gdb_test "python print int(gdb.parse_and_eval('sr'))" \
gdb_test "python print(int(gdb.parse_and_eval('sr')))" \
"48"
gdb_test "python print int(gdb.parse_and_eval('si'))" \
gdb_test "python print(int(gdb.parse_and_eval('si')))" \
"740804"
gdb_test "python print int(gdb.parse_and_eval('ir'))" \
gdb_test "python print(int(gdb.parse_and_eval('ir')))" \
"974"

4
gdb/testsuite/gdb.dwarf2/symtab-producer.exp
View File

@ -95,9 +95,9 @@ if { [skip_python_tests] } { continue }
gdb_py_test_silent_cmd "python with_producer = gdb.lookup_global_symbol(\"with_producer\")" \
"get with_producer symbol" 0
gdb_test "python print with_producer.symtab.producer" "ACME Compiler Company"
gdb_test "python print(with_producer.symtab.producer)" "ACME Compiler Company"
gdb_py_test_silent_cmd "python without_producer = gdb.lookup_global_symbol(\"without_producer\")" \
"get without_producer symbol" 0
gdb_test "python print without_producer.symtab.producer" "None"
gdb_test "python print(without_producer.symtab.producer)" "None"

2
gdb/testsuite/gdb.gdb/python-interrupts.exp
View File

@ -25,7 +25,7 @@ proc test_python_interrupts {} {
}
gdb_breakpoint set_active_ext_lang temporary
gdb_test "call catch_command_errors(execute_command, \"python print 5\", 0, RETURN_MASK_ALL)" \
gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0, RETURN_MASK_ALL)" \
"Temporary breakpoint.*silently stop."
gdb_test "signal SIGINT" \
"KeyboardInterrupt.*Error while executing Python code."

2
gdb/testsuite/gdb.gdb/python-selftest.exp
View File

@ -22,7 +22,7 @@ proc selftest_python {} {
}
gdb_test_no_output "set variable gdb_python_initialized = 0"
gdb_test "call catch_command_errors(execute_command, \"python print 5\", 0, RETURN_MASK_ALL)" \
gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0, RETURN_MASK_ALL)" \
"Python not initialized.* = 0"
return 0
}

14
gdb/testsuite/gdb.python/py-linetable.exp
View File

@ -44,17 +44,17 @@ gdb_py_test_multiple "input simple command" \
"python" "" \
"def list_lines():" "" \
" for l in lt:" "" \
" print 'L' +str(l.line)+' A '+hex(l.pc)" "" \
" print ('L' + str(l.line) + ' A ' + hex(l.pc))" "" \
"end" ""
gdb_test "python list_lines()" \
"L20 A $hex.*L21 A $hex.*L22 A $hex.*L24 A $hex.*L25 A $hex.*L40 A $hex.*L42 A $hex.*L44 A $hex.*L42 A $hex.*L46 A $hex.*" \
"test linetable iterator addr"
gdb_test "python print len(lt.line(42))" "2" \
gdb_test "python print(len(lt.line(42)))" "2" \
"Test length of a multiple pc line"
gdb_test "python print len(lt.line(20))" "1" \
gdb_test "python print(len(lt.line(20)))" "1" \
"Test length of a single pc line"
gdb_test "python print lt.line(1)" "None" \
gdb_test "python print(lt.line(1))" "None" \
"Test None returned for line with no pc"
# Test gdb.Linetable.sourcelines ()
@ -65,12 +65,12 @@ gdb_test "python print (sorted(fset))" \
"Test frozen set contains line numbers"
# Test gdb.Linetable.has_line ()
gdb_test "python print lt.has_line(20)" \
gdb_test "python print(lt.has_line(20))" \
"True.*" \
"Test has_pcs at line 20"
gdb_test "python print lt.has_line(44)" \
gdb_test "python print(lt.has_line(44))" \
"True.*" \
"Test has_pcs at line 40"
gdb_test "python print lt.has_line(10)" \
gdb_test "python print(lt.has_line(10))" \
"False.*" \
"Test has_pcs at line 10"

6
gdb/testsuite/gdb.python/py-type.exp
View File

@ -89,10 +89,10 @@ proc test_fields {lang} {
gdb_py_test_silent_cmd "python ss = gdb.parse_and_eval('ss')" "init ss" 1
gdb_py_test_silent_cmd "python ss_fields = ss.type.fields()" \
"get fields from ss.type" 1
gdb_test "python print len(ss_fields)" "2" "Check length of ss_fields"
gdb_test "python print ss_fields\[0\].name is None" "True" \
gdb_test "python print(len(ss_fields))" "2" "Check length of ss_fields"
gdb_test "python print(ss_fields\[0\].name is None)" "True" \
"Check ss_fields\[0\].name"
gdb_test "python print ss_fields\[1\].name is None" "True" \
gdb_test "python print(ss_fields\[1\].name is None)" "True" \
"Check ss_fields\[1\].name"
# Regression test for
# http://sourceware.org/bugzilla/show_bug.cgi?id=12070.

22
gdb/testsuite/gdb.python/py-value-cc.exp
View File

@ -88,18 +88,18 @@ gdb_test "python print(b_td\[b_fields\[0\]\]\['a'\])" "100" \
gdb_test "python print(u\[u_fields\[0\]\])" "99.*" "u's first field via field"
gdb_test "python print(u\[u_fields\[1\]\])" "99.*" "u's second field via field"
gdb_test "python print len(x_fields)" "2" "number for fields in u"
gdb_test "python print x\[x_fields\[0\]\]\['x'\]" "101" "x.x via field"
gdb_test "python print x\[x_fields\[1\]\]\['a'\]" "102" "x.a via field"
gdb_test "python print x_ptr\[x_fields\[0\]\]\['x'\]" "101" "x_ptr->x via field"
gdb_test "python print x_ptr\[x_fields\[1\]\]\['a'\]" "102" "x_ptr->a via field"
gdb_test "python print xtd\[x_fields\[0\]\]\['x'\]" "101" "xtd->x via field"
gdb_test "python print xtd\[x_fields\[1\]\]\['a'\]" "102" "xtd->a via field"
gdb_test "python print(len(x_fields))" "2" "number for fields in u"
gdb_test "python print(x\[x_fields\[0\]\]\['x'\])" "101" "x.x via field"
gdb_test "python print(x\[x_fields\[1\]\]\['a'\])" "102" "x.a via field"
gdb_test "python print(x_ptr\[x_fields\[0\]\]\['x'\])" "101" "x_ptr->x via field"
gdb_test "python print(x_ptr\[x_fields\[1\]\]\['a'\])" "102" "x_ptr->a via field"
gdb_test "python print(xtd\[x_fields\[0\]\]\['x'\])" "101" "xtd->x via field"
gdb_test "python print(xtd\[x_fields\[1\]\]\['a'\])" "102" "xtd->a via field"
gdb_test "python print len(uu_fields)" "2" "number of fields in uu"
gdb_test "python print uu\[uu_fields\[0\]\]\['x'\]" "1000" "uu.x via field"
gdb_test "python print uu\[uu_fields\[1\]\]\['a'\]" "1000" "uu.a via field"
gdb_test "python print(len(uu_fields))" "2" "number of fields in uu"
gdb_test "python print(uu\[uu_fields\[0\]\]\['x'\])" "1000" "uu.x via field"
gdb_test "python print(uu\[uu_fields\[1\]\]\['a'\])" "1000" "uu.a via field"
# Test overloaded operators.
gdb_test_no_output "python a = gdb.parse_and_eval('a')" "init a"
gdb_test "python print a + 5" "10" "a + 5"
gdb_test "python print(a + 5)" "10" "a + 5"

2
gdb/testsuite/gdb.python/py-value.exp
View File

@ -294,7 +294,7 @@ proc test_value_in_inferior {} {
# Test fetching a string longer than its declared (in C) size.
# PR 16286
gdb_py_test_silent_cmd "python xstr = gdb.parse_and_eval('xstr')" "get xstr" 1
gdb_test "python print xstr\['text'\].string (length = xstr\['length'\])" "x{100}" \
gdb_test "python print(xstr\['text'\].string (length = xstr\['length'\]))" "x{100}" \
"read string beyond declared size"
}