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

Change method of loading .py files in Python tests 

With my debug build of Python (--with-pydebug), many tests fails because
of the same issue.  Python scripts are loaded by the tests using this
pattern:

  (gdb) python exec (open ('file.py').read ())

This causes Python to output this warning:

  __main__:1: ResourceWarning: unclosed file <_io.TextIOWrapper name='file.py' mode='r' encoding='ANSI_X3.4-1968'>

and the test to fail because of that extra output.  Instead of using the
open + read + exec trick which leaks the file and causes the warning,
why not just source the files?

  (gdb) source file.py

This patch changes this, and standardizes the test names of the tests I
touched to "load python file" (some of them were empty, others were
overly complicated).

gdb/testsuite/ChangeLog:

	* gdb.python/py-bad-printers.exp: Load python file using "source".
	* gdb.python/py-events.exp: Likewise.
	* gdb.python/py-evsignal.exp: Likewise.
	* gdb.python/py-evthreads.exp: Likewise.
	* gdb.python/py-frame-args.exp: Likewise.
	* gdb.python/py-framefilter-invalidarg.exp: Likewise.
	* gdb.python/py-framefilter-mi.exp: Likewise.
	* gdb.python/py-framefilter.exp: Likewise.
	* gdb.python/py-mi.exp: Likewise.
	* gdb.python/py-pp-maint.exp: Likewise.
	* gdb.python/py-pp-registration.exp: Likewise.
	* gdb.python/py-prettyprint.exp: Likewise.
	(run_lang_tests): Likewise.
	* gdb.python/py-typeprint.exp: Likewise.
This commit is contained in:
Simon Marchi 2017-01-26 16:12:12 -05:00 committed by Simon Marchi
parent e3ceef3544
commit 72ca041044
14 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,20 @@
2017-01-26 Simon Marchi <simon.marchi@polymtl.ca>
* gdb.python/py-bad-printers.exp: Load python file using "source".
* gdb.python/py-events.exp: Likewise.
* gdb.python/py-evsignal.exp: Likewise.
* gdb.python/py-evthreads.exp: Likewise.
* gdb.python/py-frame-args.exp: Likewise.
* gdb.python/py-framefilter-invalidarg.exp: Likewise.
* gdb.python/py-framefilter-mi.exp: Likewise.
* gdb.python/py-framefilter.exp: Likewise.
* gdb.python/py-mi.exp: Likewise.
* gdb.python/py-pp-maint.exp: Likewise.
* gdb.python/py-pp-registration.exp: Likewise.
* gdb.python/py-prettyprint.exp: Likewise.
(run_lang_tests): Likewise.
* gdb.python/py-typeprint.exp: Likewise.
2017-01-26 Luis Machado <lgustavo@codesourcery.com> 2017-01-26 Luis Machado <lgustavo@codesourcery.com>
* lib/memory.exp: New file. * lib/memory.exp: New file.

3
gdb/testsuite/gdb.python/py-bad-printers.exp
View File

@ -35,8 +35,7 @@ if ![runto_main ] then {
set remote_python_file [gdb_remote_download host \ set remote_python_file [gdb_remote_download host \
${srcdir}/${subdir}/${testfile}.py] ${srcdir}/${subdir}/${testfile}.py]
gdb_test_no_output "python exec (open ('${remote_python_file}').read ())" \ gdb_test_no_output "source ${remote_python_file}" "load python file"
"load python file"
gdb_breakpoint [gdb_get_line_number "break here"] gdb_breakpoint [gdb_get_line_number "break here"]
gdb_continue_to_breakpoint "break here" ".* break here .*" gdb_continue_to_breakpoint "break here" ".* break here .*"

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

@ -43,7 +43,7 @@ clean_restart ${testfile}
if { [skip_python_tests] } { continue } if { [skip_python_tests] } { continue }
gdb_test_no_output "python exec (open ('${pyfile}').read ())" "" gdb_test_no_output "source ${pyfile}" "load python file"
gdb_test "test-objfile-events" "Object file events registered." gdb_test "test-objfile-events" "Object file events registered."

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

@ -31,7 +31,7 @@ clean_restart $testfile
if { [skip_python_tests] } { continue } if { [skip_python_tests] } { continue }
gdb_test_no_output "python exec (open ('${pyfile}').read ())" "" gdb_test_no_output "source ${pyfile}" "load python file"
gdb_test "test-events" "Event testers registered." gdb_test "test-events" "Event testers registered."
gdb_test_no_output "set non-stop on" gdb_test_no_output "set non-stop on"

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

@ -36,7 +36,7 @@ clean_restart $testfile
if { [skip_python_tests] } { continue } if { [skip_python_tests] } { continue }
gdb_test_no_output "python exec (open ('${pyfile}').read ())" "" gdb_test_no_output "source ${pyfile}" "load python file"
gdb_test "test-events" "Event testers registered." gdb_test "test-events" "Event testers registered."
gdb_test_no_output "set non-stop on" gdb_test_no_output "set non-stop on"

3
gdb/testsuite/gdb.python/py-frame-args.exp
View File

@ -29,8 +29,7 @@ if ![runto_main] {
set remote_python_file [gdb_remote_download host \ set remote_python_file [gdb_remote_download host \
${srcdir}/${subdir}/${testfile}.py] ${srcdir}/${subdir}/${testfile}.py]
gdb_test_no_output "python exec (open ('${remote_python_file}').read ())" \ gdb_test_no_output "source ${remote_python_file}" "load python file"
"python exec (open ('[file tail ${remote_python_file}]').read ())"
gdb_breakpoint [gdb_get_line_number "break-here"] gdb_breakpoint [gdb_get_line_number "break-here"]
gdb_continue_to_breakpoint "break-here" ".* break-here .*" gdb_continue_to_breakpoint "break-here" ".* break-here .*"

3
gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp
View File

@ -61,7 +61,6 @@ gdb_test_no_output "set python print-stack full" \
# Load global frame-filters # Load global frame-filters
set remote_python_file [gdb_remote_download host \ set remote_python_file [gdb_remote_download host \
${srcdir}/${subdir}/${testfile}.py] ${srcdir}/${subdir}/${testfile}.py]
gdb_test_no_output "python exec (open ('${remote_python_file}').read ())" \ gdb_test_no_output "source ${remote_python_file}" "load python file"
"load python file"
gdb_test "bt" " in niam \\(argc=<error reading variable: dwarf expression stack underflow>, argv=0x\[0-9a-f\]+\\) at py-framefilter-invalidarg.c:\[0-9\]+" "bt full with filters" gdb_test "bt" " in niam \\(argc=<error reading variable: dwarf expression stack underflow>, argv=0x\[0-9a-f\]+\\) at py-framefilter-invalidarg.c:\[0-9\]+" "bt full with filters"

3
gdb/testsuite/gdb.python/py-framefilter-mi.exp
View File

@ -46,8 +46,7 @@ mi_runto main
set remote_python_file [gdb_remote_download host ${srcdir}/${subdir}/${pyfile}] set remote_python_file [gdb_remote_download host ${srcdir}/${subdir}/${pyfile}]
mi_gdb_test "python exec (open ('${remote_python_file}').read ())" ".*\\^done." \ mi_gdb_test "source ${remote_python_file}" ".*\\^done." "load python file"
"Load python file"
# Multiple blocks test # Multiple blocks test
mi_continue_to_line [gdb_get_line_number {Inner test breakpoint} ${srcfile}] \ mi_continue_to_line [gdb_get_line_number {Inner test breakpoint} ${srcfile}] \

5
gdb/testsuite/gdb.python/py-framefilter.exp
View File

@ -63,8 +63,7 @@ gdb_test_no_output "set python print-stack full" \
# Load global frame-filters # Load global frame-filters
set remote_python_file [gdb_remote_download host \ set remote_python_file [gdb_remote_download host \
${srcdir}/${subdir}/${testfile}.py] ${srcdir}/${subdir}/${testfile}.py]
gdb_test_no_output "python exec (open ('${remote_python_file}').read ())" \ gdb_test_no_output "source ${remote_python_file}" "load python file"
"load python file"
gdb_breakpoint [gdb_get_line_number "Backtrace end breakpoint"] gdb_breakpoint [gdb_get_line_number "Backtrace end breakpoint"]
gdb_breakpoint [gdb_get_line_number "Inner test breakpoint"] gdb_breakpoint [gdb_get_line_number "Inner test breakpoint"]
@ -253,7 +252,7 @@ gdb_test_no_output "set python print-stack full" \
# Load global frame-filters # Load global frame-filters
set remote_python_file [gdb_remote_download host \ set remote_python_file [gdb_remote_download host \
${srcdir}/${subdir}/${testfile}.py] ${srcdir}/${subdir}/${testfile}.py]
gdb_test_no_output "python exec (open ('${remote_python_file}').read ())" \ gdb_test_no_output "source ${remote_python_file}" \
"load python file for no debuginfo tests" "load python file for no debuginfo tests"
# Disable Reverse # Disable Reverse

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

@ -44,7 +44,7 @@ mi_runto main
set remote_python_file [gdb_remote_download host ${srcdir}/${subdir}/${pyfile}] set remote_python_file [gdb_remote_download host ${srcdir}/${subdir}/${pyfile}]
mi_gdb_test "python exec (open ('${remote_python_file}').read ())" "" mi_gdb_test "source ${remote_python_file}" "load python file"
mi_continue_to_line [gdb_get_line_number {MI breakpoint here} ${srcfile}] \ mi_continue_to_line [gdb_get_line_number {MI breakpoint here} ${srcfile}] \
"step to breakpoint" "step to breakpoint"

2
gdb/testsuite/gdb.python/py-pp-maint.exp
View File

@ -43,7 +43,7 @@ gdb_test "continue" ".*Breakpoint.*"
set python_file ${srcdir}/${subdir}/${testfile}.py set python_file ${srcdir}/${subdir}/${testfile}.py
gdb_test_no_output "python exec (open ('${python_file}').read ())" "" gdb_test_no_output "source ${python_file}" "load python file"
gdb_test "info pretty-printer" \ gdb_test "info pretty-printer" \
{.*function_lookup_test.*pp-test.*struct ss.*} {.*function_lookup_test.*pp-test.*struct ss.*}

3
gdb/testsuite/gdb.python/py-pp-registration.exp
View File

@ -46,8 +46,7 @@ proc prepare_test { } {
return 0 return 0
} }
gdb_test_no_output "python exec (open ('${remote_python_file}').read ())" \ gdb_test_no_output "source ${remote_python_file}" "read file"
"read file"
gdb_test_no_output "py progspace = gdb.current_progspace()" gdb_test_no_output "py progspace = gdb.current_progspace()"
gdb_test_no_output "py my_pretty_printer1 = build_pretty_printer1()" gdb_test_no_output "py my_pretty_printer1 = build_pretty_printer1()"

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

@ -56,8 +56,7 @@ proc run_lang_tests {exefile lang} {
set remote_python_file [gdb_remote_download host \ set remote_python_file [gdb_remote_download host \
${srcdir}/${subdir}/${testfile}.py] ${srcdir}/${subdir}/${testfile}.py]
gdb_test_no_output "python exec (open ('${remote_python_file}').read ())" \ gdb_test_no_output "source ${remote_python_file}" "load python file"
"python exec (open ('[file tail ${remote_python_file}]').read ())"
gdb_test "print ss" " = a=< a=<1> b=<$hex>> b=< a=<2> b=<$hex>>" gdb_test "print ss" " = a=< a=<1> b=<$hex>> b=< a=<2> b=<$hex>>"
gdb_test "print ssa\[1\]" " = a=< a=<5> b=<$hex>> b=< a=<6> b=<$hex>>" gdb_test "print ssa\[1\]" " = a=< a=<5> b=<$hex>> b=< a=<6> b=<$hex>>"
@ -137,8 +136,7 @@ if ![runto_main ] then {
set remote_python_file [gdb_remote_download host \ set remote_python_file [gdb_remote_download host \
${srcdir}/${subdir}/${testfile}.py] ${srcdir}/${subdir}/${testfile}.py]
gdb_test_no_output "python exec (open ('${remote_python_file}').read ())" \ gdb_test_no_output "source ${remote_python_file}" "load python file"
"python exec (open ('[file tail ${remote_python_file}]').read ())"
gdb_breakpoint [gdb_get_line_number "eval-break"] gdb_breakpoint [gdb_get_line_number "eval-break"]
gdb_continue_to_breakpoint "eval-break" ".* eval-break .*" gdb_continue_to_breakpoint "eval-break" ".* eval-break .*"

3
gdb/testsuite/gdb.python/py-typeprint.exp
View File

@ -29,8 +29,7 @@ if { [skip_python_tests] } { continue }
set remote_python_file [gdb_remote_download host \ set remote_python_file [gdb_remote_download host \
${srcdir}/${subdir}/${testfile}.py] ${srcdir}/${subdir}/${testfile}.py]
gdb_test_no_output "python exec (open ('${remote_python_file}').read ())" \ gdb_test_no_output "source ${remote_python_file}" "load python file"
"python exec (open ('[file tail ${remote_python_file}]').read ())"
cp_test_ptype_class s "basic test" "class" "templ<string>" { cp_test_ptype_class s "basic test" "class" "templ<string>" {
{ field public "T x;" } { field public "T x;" }