diff options
| author | Phil Muldoon <pmuldoon@redhat.com> | 2011-01-10 11:00:24 +0000 |
|---|---|---|
| committer | Phil Muldoon <pmuldoon@redhat.com> | 2011-01-10 11:00:24 +0000 |
| commit | f39a75d0cd43b47ae2f8775d461e65baeefcbc9b (patch) | |
| tree | 7cf7574960388cb9f61d683fa9065d9b34fac6af /gdb | |
| parent | 7af8ed2d479fcf1180e05b47e294e685dae4626e (diff) | |
| download | gdb-f39a75d0cd43b47ae2f8775d461e65baeefcbc9b.zip gdb-f39a75d0cd43b47ae2f8775d461e65baeefcbc9b.tar.gz gdb-f39a75d0cd43b47ae2f8775d461e65baeefcbc9b.tar.bz2 | |
2011-01-10 Phil Muldoon <pmuldoon@redhat.com>
* gdb.python/py-cmd.exp: Remove gdb_py_test_multiple function.
Use load_lib gdb-python.exp.
* gdb.python/python.exp: Ditto.
* gdb.python/py-function.exp: Ditto.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/py-cmd.exp | 18 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/py-function.exp | 18 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/python.exp | 18 |
4 files changed, 9 insertions, 52 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c8ca29c..437a229 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2011-01-10 Phil Muldoon <pmuldoon@redhat.com> + + * gdb.python/py-cmd.exp: Remove gdb_py_test_multiple function. + Use load_lib gdb-python.exp. + * gdb.python/python.exp: Ditto. + * gdb.python/py-function.exp: Ditto. + 2011-01-09 Andreas Schwab <schwab@linux-m68k.org> * gdb.threads/tls.exp ("info address me"): Fix expected output. diff --git a/gdb/testsuite/gdb.python/py-cmd.exp b/gdb/testsuite/gdb.python/py-cmd.exp index 66d3e53..e4706cd 100644 --- a/gdb/testsuite/gdb.python/py-cmd.exp +++ b/gdb/testsuite/gdb.python/py-cmd.exp @@ -20,23 +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 -} +load_lib gdb-python.exp # Start with a fresh gdb. diff --git a/gdb/testsuite/gdb.python/py-function.exp b/gdb/testsuite/gdb.python/py-function.exp index a5c8025..bbbbf42 100644 --- a/gdb/testsuite/gdb.python/py-function.exp +++ b/gdb/testsuite/gdb.python/py-function.exp @@ -20,23 +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 -} +load_lib gdb-python.exp # Start with a fresh gdb. diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp index 090f528..ece77ca 100644 --- a/gdb/testsuite/gdb.python/python.exp +++ b/gdb/testsuite/gdb.python/python.exp @@ -53,24 +53,6 @@ gdb_test_multiple "python print 23" "verify python support" { -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 -} - gdb_py_test_multiple "multi-line python command" \ "python" "" \ "print 23" "" \ |