[commit] minor gdb.python test cleanup
Doug Evans
dje@google.com
Fri Oct 1 17:05:00 GMT 2010
Hi.
fyi, I've committed this minor cleanup.
2010-10-01 Doug Evans <dje@google.com>
* lib/gdb-python.exp: New file.
* gdb.python/py-block.exp: Use it.
* gdb.python/py-breakpoint.exp: Ditto.
* gdb.python/py-frame.exp: Ditto.
* gdb.python/py-inferior.exp: Ditto.
* gdb.python/py-param.exp: Ditto.
* gdb.python/py-prettyprint.exp: Ditto.
* gdb.python/py-shared.exp: Ditto.
* gdb.python/py-symbol.exp: Ditto.
* gdb.python/py-symtab.exp: Ditto.
* gdb.python/py-type.exp: Ditto.
* gdb.python/py-value.exp: Ditto.
* gdb.python/python.exp: Ditto.
Index: lib/gdb-python.exp
===================================================================
RCS file: lib/gdb-python.exp
diff -N lib/gdb-python.exp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lib/gdb-python.exp 1 Oct 2010 17:01:07 -0000
@@ -0,0 +1,47 @@
+# Copyright 2010 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
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Utilities for python-scripting related tests.
+
+# 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
+}
Index: gdb.python/py-block.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-block.exp,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 py-block.exp
--- gdb.python/py-block.exp 10 Jun 2010 19:48:20 -0000 1.3
+++ gdb.python/py-block.exp 1 Oct 2010 17:01:07 -0000
@@ -20,6 +20,8 @@ if $tracelevel then {
strace $tracelevel
}
+load_lib gdb-python.exp
+
set testfile "py-block"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
@@ -28,17 +30,6 @@ if { [gdb_compile "${srcdir}/${subdir}/$
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
Index: gdb.python/py-breakpoint.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-breakpoint.exp,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 py-breakpoint.exp
--- gdb.python/py-breakpoint.exp 18 Jun 2010 16:51:10 -0000 1.3
+++ gdb.python/py-breakpoint.exp 1 Oct 2010 17:01:07 -0000
@@ -20,23 +20,14 @@ if $tracelevel then {
strace $tracelevel
}
+load_lib gdb-python.exp
+
set testfile "py-breakpoint"
set srcfile ${testfile}.c
if { [prepare_for_testing ${testfile}.exp ${testfile} ${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.
clean_restart ${testfile}
Index: gdb.python/py-frame.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-frame.exp,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 py-frame.exp
--- gdb.python/py-frame.exp 8 Jun 2010 22:58:03 -0000 1.6
+++ gdb.python/py-frame.exp 1 Oct 2010 17:01:07 -0000
@@ -20,6 +20,8 @@ if $tracelevel then {
strace $tracelevel
}
+load_lib gdb-python.exp
+
set testfile "py-frame"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
@@ -28,17 +30,6 @@ if { [gdb_compile "${srcdir}/${subdir}/$
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
Index: gdb.python/py-inferior.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-inferior.exp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 py-inferior.exp
--- gdb.python/py-inferior.exp 28 Jun 2010 21:16:04 -0000 1.1
+++ gdb.python/py-inferior.exp 1 Oct 2010 17:01:07 -0000
@@ -20,16 +20,7 @@ if $tracelevel then {
strace $tracelevel
}
-# 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 } }
- }
-}
+load_lib gdb-python.exp
set testfile "py-inferior"
set srcfile ${testfile}.c
Index: gdb.python/py-param.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-param.exp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 py-param.exp
--- gdb.python/py-param.exp 29 Apr 2010 15:45:57 -0000 1.1
+++ gdb.python/py-param.exp 1 Oct 2010 17:01:07 -0000
@@ -20,34 +20,7 @@ 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
-}
-
-# 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 } }
- }
-}
+load_lib gdb-python.exp
# Start with a fresh gdb.
gdb_exit
Index: gdb.python/py-prettyprint.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-prettyprint.exp,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 py-prettyprint.exp
--- gdb.python/py-prettyprint.exp 14 Jul 2010 14:13:55 -0000 1.12
+++ gdb.python/py-prettyprint.exp 1 Oct 2010 17:01:07 -0000
@@ -20,6 +20,8 @@ if $tracelevel then {
strace $tracelevel
}
+load_lib gdb-python.exp
+
set testfile "py-prettyprint"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
@@ -31,17 +33,6 @@ gdb_start
# Skip all tests if Python scripting is not enabled.
if { [skip_python_tests] } { continue }
-# 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 run_lang_tests {lang} {
global srcdir subdir srcfile binfile testfile hex
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "debug $lang"] != "" } {
Index: gdb.python/py-shared.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-shared.exp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 py-shared.exp
--- gdb.python/py-shared.exp 19 Aug 2010 17:00:58 -0000 1.1
+++ gdb.python/py-shared.exp 1 Oct 2010 17:01:07 -0000
@@ -15,6 +15,8 @@
# This file is part of the GDB testsuite.
+load_lib gdb-python.exp
+
if {[skip_shlib_tests]} {
return 0
}
@@ -38,17 +40,6 @@ if { [gdb_compile ${srcdir}/${subdir}/${
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
Index: gdb.python/py-symbol.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-symbol.exp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 py-symbol.exp
--- gdb.python/py-symbol.exp 9 Mar 2010 18:08:05 -0000 1.2
+++ gdb.python/py-symbol.exp 1 Oct 2010 17:01:07 -0000
@@ -20,6 +20,8 @@ if $tracelevel then {
strace $tracelevel
}
+load_lib gdb-python.exp
+
set testfile "py-symbol"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
@@ -28,17 +30,6 @@ if { [gdb_compile "${srcdir}/${subdir}/$
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
Index: gdb.python/py-symtab.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-symtab.exp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 py-symtab.exp
--- gdb.python/py-symtab.exp 24 Feb 2010 21:18:28 -0000 1.1
+++ gdb.python/py-symtab.exp 1 Oct 2010 17:01:07 -0000
@@ -20,6 +20,8 @@ if $tracelevel then {
strace $tracelevel
}
+load_lib gdb-python.exp
+
set testfile "py-symbol"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
@@ -28,17 +30,6 @@ if { [gdb_compile "${srcdir}/${subdir}/$
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
Index: gdb.python/py-type.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-type.exp,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 py-type.exp
--- gdb.python/py-type.exp 23 Aug 2010 20:26:10 -0000 1.9
+++ gdb.python/py-type.exp 1 Oct 2010 17:01:07 -0000
@@ -20,6 +20,8 @@ if $tracelevel then {
strace $tracelevel
}
+load_lib gdb-python.exp
+
set testfile "py-type"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
@@ -59,17 +61,6 @@ proc runto_bp {bp} {
gdb_continue_to_breakpoint $bp
}
-# 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_fields {lang} {
global gdb_prompt
Index: gdb.python/py-value.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/py-value.exp,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 py-value.exp
--- gdb.python/py-value.exp 30 Aug 2010 20:28:31 -0000 1.16
+++ gdb.python/py-value.exp 1 Oct 2010 17:01:07 -0000
@@ -20,6 +20,8 @@ if $tracelevel then {
strace $tracelevel
}
+load_lib gdb-python.exp
+
set testfile "py-value"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
@@ -28,35 +30,6 @@ if { [gdb_compile "${srcdir}/${subdir}/$
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
Index: gdb.python/python.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.python/python.exp,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 python.exp
--- gdb.python/python.exp 11 Sep 2010 16:00:27 -0000 1.15
+++ gdb.python/python.exp 1 Oct 2010 17:01:07 -0000
@@ -20,6 +20,8 @@ if $tracelevel then {
strace $tracelevel
}
+load_lib gdb-python.exp
+
set testfile "python"
set srcfile ${testfile}.c
set srcfile1 ${testfile}-1.c
@@ -39,17 +41,6 @@ gdb_reinitialize_dir $srcdir/$subdir
# Skip all tests if Python scripting is not enabled.
if { [skip_python_tests] } { continue }
-# 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 } }
- }
-}
-
gdb_test_multiple "python print 23" "verify python support" {
-re "not supported.*$gdb_prompt $" {
unsupported "python support is disabled"
More information about the Gdb-patches
mailing list