Re: [rfa][testsuite] Consolidade Python test functions in lib/gdb.exp.

Thiago Jung Bauermann
2009-05-31T22:26:37Z

Em Qua, 2009-05-20 Ã s 23:00 +0300, Eli Zaretskii escreveu:
> > From: Thiago Jung Bauermann <bauerman@br.ibm.com>
> > Cc: drow@false.org, tromey@redhat.com, gdb-patches@sourceware.org
> > Date: Wed, 20 May 2009 16:39:00 -0300
> >
> > Since the 8.3 problem already exists in today's repo, do you mind if
> > I commit the patch and pledge to fix this before 7.0 is released?
>
> No, I don't mind. Thanks.

Great. This is the latest version of the patch then, which addresses all
comments on it.
--
[]'s
Thiago Jung Bauermann
IBM Linux Technology Center

gdb/testsuite/
* lib/gdb.exp (python_supported, gdb_py_test_silent_cmd,
gdb_py_test_multiple): New functions.
* gdb.python/python-cmd.exp: Use Python test functions from
lib/gdb.exp instead of defining its own functions.
* gdb.python/python-frame.exp: Likewise.
* gdb.python/python-function.exp: Likewise.
* gdb.python/python-value.exp: Likewise.
* gdb.python/python.exp: Likewise.

Index: gdb.git/gdb/testsuite/gdb.python/python-cmd.exp
===================================================================
--- gdb.git.orig/gdb/testsuite/gdb.python/python-cmd.exp 2009-05-03 23:05:58.000000000 -0300
+++ gdb.git/gdb/testsuite/gdb.python/python-cmd.exp 2009-05-31 17:48:49.000000000 -0300
@@ -20,36 +20,15 @@ if $tracelevel then {
strace $tracelevel
}

-# Usage: gdb_py_test_multiple NAME INPUT RESULT {INPUT RESULT}...
-# Run a test named NAME, consisting of multiple lines of input.
-# After each input line INPUT, search for result line RESULT.
-# Succeed if all results are seen; fail otherwise.
-proc gdb_py_test_multiple {name args} {
- global gdb_prompt
- foreach {input result} $args {
- if {[gdb_test_multiple $input "$name - $input" {
- -re "\[\r\n\]*($result)\[\r\n\]+($gdb_prompt | *>)$" {
- pass "$name - $input"
- }
- }]} {
- return 1
- }
- }
- return 0
-}
-
# Start with a fresh gdb.

gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir

-gdb_test_multiple "python print 'hello, world!'" "verify python support" {
- -re "not supported.*$gdb_prompt $" {
- unsupported "python support is disabled"
- return -1
- }
- -re "$gdb_prompt $" {}
+if ![python_supported] then {
+ unsupported "python support is disabled"
+ return -1
}

# Test a simple command.
Index: gdb.git/gdb/testsuite/gdb.python/python-frame.exp
===================================================================
--- gdb.git.orig/gdb/testsuite/gdb.python/python-frame.exp 2009-05-03 23:05:58.000000000 -0300
+++ gdb.git/gdb/testsuite/gdb.python/python-frame.exp 2009-05-31 19:01:31.000000000 -0300
@@ -20,40 +20,28 @@ if $tracelevel then {
strace $tracelevel
}

+# Start with a fresh gdb.
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+
+if ![python_supported] then {
+ unsupported "python support is disabled"
+ return -1
+}
+
set testfile "python-frame"
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
}

-# 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
-
- gdb_test_multiple $cmd $name {
- -re "Traceback.*$gdb_prompt $" { fail $name }
- -re "$gdb_prompt $" { if $report_pass { pass $name } }
- }
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}

-gdb_test_multiple "python print 'hello, world!'" "verify python support" {
- -re "not supported.*$gdb_prompt $" {
- unsupported "python support is disabled"
- return -1
- }
- -re "$gdb_prompt $" {}
-}
-
# The following tests require execution.

if ![runto_main] then {
Index: gdb.git/gdb/testsuite/gdb.python/python-function.exp
===================================================================
--- gdb.git.orig/gdb/testsuite/gdb.python/python-function.exp 2009-05-03 23:05:58.000000000 -0300
+++ gdb.git/gdb/testsuite/gdb.python/python-function.exp 2009-05-31 17:48:49.000000000 -0300
@@ -20,36 +20,15 @@ if $tracelevel then {
strace $tracelevel
}

-# Usage: gdb_py_test_multiple NAME INPUT RESULT {INPUT RESULT}...
-# Run a test named NAME, consisting of multiple lines of input.
-# After each input line INPUT, search for result line RESULT.
-# Succeed if all results are seen; fail otherwise.
-proc gdb_py_test_multiple {name args} {
- global gdb_prompt
- foreach {input result} $args {
- if {[gdb_test_multiple $input "$name - $input" {
- -re "\[\r\n\]*($result)\[\r\n\]+($gdb_prompt | *>)$" {
- pass "$name - $input"
- }
- }]} {
- return 1
- }
- }
- return 0
-}
-
# Start with a fresh gdb.

gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir

-gdb_test_multiple "python print 'hello, world!'" "verify python support" {
- -re "not supported.*$gdb_prompt $" {
- unsupported "python support is disabled"
- return -1
- }
- -re "$gdb_prompt $" {}
+if ![python_supported] then {
+ unsupported "python support is disabled"
+ return -1
}

gdb_py_test_multiple "input convenience function" \
Index: gdb.git/gdb/testsuite/gdb.python/python-value.exp
===================================================================
--- gdb.git.orig/gdb/testsuite/gdb.python/python-value.exp 2009-05-31 17:05:44.000000000 -0300
+++ gdb.git/gdb/testsuite/gdb.python/python-value.exp 2009-05-31 19:01:31.000000000 -0300
@@ -20,43 +20,6 @@ if $tracelevel then {
strace $tracelevel
}

-set testfile "python-value"
-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
-}
-
-# Usage: gdb_py_test_multiple NAME INPUT RESULT {INPUT RESULT}...
-# Run a test named NAME, consisting of multiple lines of input.
-# After each input line INPUT, search for result line RESULT.
-# Succeed if all results are seen; fail otherwise.
-proc gdb_py_test_multiple {name args} {
- global gdb_prompt
- foreach {input result} $args {
- if {[gdb_test_multiple $input "$name - $input" {
- -re "\[\r\n\]*($result)\[\r\n\]+($gdb_prompt | *>)$" {
- pass "$name - $input"
- }
- }]} {
- return 1
- }
- }
- return 0
-}
-
-# 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
-
- gdb_test_multiple $cmd $name {
- -re "Traceback.*$gdb_prompt $" { fail $name }
- -re "$gdb_prompt $" { if $report_pass { pass $name } }
- }
-}
-
proc test_value_creation {} {
global gdb_prompt

@@ -278,16 +241,23 @@ proc test_value_after_death {} {
gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}

-gdb_test_multiple "python print 'hello, world!'" "verify python support" {
- -re "not supported.*$gdb_prompt $" {
- unsupported "python support is disabled"
- return -1
- }
- -re "$gdb_prompt $" {}
+if ![python_supported] then {
+ unsupported "python support is disabled"
+ return -1
+}
+
+set testfile "python-value"
+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
}

+gdb_load ${binfile}
+
test_value_creation
test_value_numeric_ops
test_value_boolean
Index: gdb.git/gdb/testsuite/lib/gdb.exp
===================================================================
--- gdb.git.orig/gdb/testsuite/lib/gdb.exp 2009-05-03 23:05:58.000000000 -0300
+++ gdb.git/gdb/testsuite/lib/gdb.exp 2009-05-31 19:01:31.000000000 -0300
@@ -27,6 +27,7 @@ if {$tool == ""} {
}

load_lib libgloss.exp
+load_lib python-support.exp

global GDB

@@ -2946,4 +2947,3 @@ proc get_hexadecimal_valueof { exp defau
proc get_sizeof { type default } {
return [get_integer_valueof "sizeof (${type})" $default]
}
-
Index: gdb.git/gdb/testsuite/gdb.python/python.exp
===================================================================
--- gdb.git.orig/gdb/testsuite/gdb.python/python.exp 2009-05-31 17:05:45.000000000 -0300
+++ gdb.git/gdb/testsuite/gdb.python/python.exp 2009-05-31 17:48:49.000000000 -0300
@@ -26,30 +26,9 @@ gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir

-gdb_test_multiple "python print 23" "verify python support" {
- -re "not supported.*$gdb_prompt $" {
- unsupported "python support is disabled"
- return -1
- }
- -re "$gdb_prompt $" {}
-}
-
-# Usage: gdb_py_test_multiple NAME INPUT RESULT {INPUT RESULT}...
-# Run a test named NAME, consisting of multiple lines of input.
-# After each input line INPUT, search for result line RESULT.
-# Succeed if all results are seen; fail otherwise.
-proc gdb_py_test_multiple {name args} {
- global gdb_prompt
- foreach {input result} $args {
- if {[gdb_test_multiple $input "$name - $input" {
- -re "\[\r\n\]*($result)\[\r\n\]+($gdb_prompt | *>)$" {
- pass "$name - $input"
- }
- }]} {
- return 1
- }
- }
- return 0
+if ![python_supported] then {
+ unsupported "python support is disabled"
+ return -1
}

gdb_py_test_multiple "multi-line python command" \
Index: gdb.git/gdb/testsuite/gdb.python/python-template.exp
===================================================================
--- gdb.git.orig/gdb/testsuite/gdb.python/python-template.exp 2009-05-31 17:05:44.000000000 -0300
+++ gdb.git/gdb/testsuite/gdb.python/python-template.exp 2009-05-31 19:01:31.000000000 -0300
@@ -20,15 +20,6 @@ if $tracelevel then {
strace $tracelevel
}

-set testfile "python-template"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
- {debug c++}] != "" } {
- untested "Couldn't compile ${srcfile}"
- return -1
-}
-
# Start with a fresh gdb.

gdb_exit
@@ -43,6 +34,15 @@ gdb_test_multiple "python print 23" "ver
-re "$gdb_prompt $" {}
}

+set testfile "python-template"
+set srcfile ${testfile}.cc
+set binfile ${objdir}/${subdir}/${testfile}
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
+ {debug c++}] != "" } {
+ untested "Couldn't compile ${srcfile}"
+ return -1
+}
+
proc test_template_arg {type} {
global testfile srcdir subdir srcfile binfile
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
Index: gdb.git/gdb/testsuite/lib/python-support.exp
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb.git/gdb/testsuite/lib/python-support.exp 2009-05-31 19:01:31.000000000 -0300
@@ -0,0 +1,53 @@
+global python_supported_saved
+
+# Return 1 if Python scripting is supported in GDB, 0 if not.
+proc python_supported { } {
+ global gdb_prompt
+ global python_supported_saved
+
+ if [info exists python_supported_saved] {
+ verbose "python_supported: returning saved $python_supported_saved" 2
+ return $python_supported_saved
+ }
+
+ gdb_test_multiple "python print 'hello, world!'" "verify python support" {
+ -re "not supported.*$gdb_prompt $" {
+ return [set python_supported_saved 0]
+ }
+ -re "$gdb_prompt $" {
+ return [set python_supported_saved 1]
+ }
+ }
+
+ return [set python_supported_saved 0]
+}
+
+# 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
+
+ gdb_test_multiple $cmd $name {
+ -re "Traceback.*$gdb_prompt $" { fail $name }
+ -re "$gdb_prompt $" { if $report_pass { pass $name } }
+ }
+}
+
+# Usage: gdb_py_test_multiple NAME INPUT RESULT {INPUT RESULT}...
+# Run a test named NAME, consisting of multiple lines of input.
+# After each input line INPUT, search for result line RESULT.
+# Succeed if all results are seen; fail otherwise.
+proc gdb_py_test_multiple {name args} {
+ global gdb_prompt
+
+ foreach {input result} $args {
+ if {[gdb_test_multiple $input "$name - $input" {
+ -re "\[\r\n\]*($result)\[\r\n\]+($gdb_prompt | *>)$" {
+ pass "$name - $input"
+ }
+ }]} {
+ return 1
+ }
+ }
+ return 0
+}