From f6bbabf05407ec9e8efb75d31fedf122bc2fdc90 Mon Sep 17 00:00:00 2001 From: Phil Muldoon Date: Wed, 24 Feb 2010 11:11:17 +0000 Subject: [PATCH] 2010-02-24 Phil Muldoon PR python/11314 * lib/gdb.exp (skip_python_tests): New function. * gdb.python/py-cmd.exp: Use skip_python_tests. * gdb.python/py-frame.exp: Likewise. * gdb.python/py-function.exp: Likewise. * gdb.python/py-prettyprint.exp: Likewise. * gdb.python/py-template.exp: Likewise. * gdb.python/py-type.exp: Likewise. * gdb.python/py-value.exp: Likewise. --- gdb/testsuite/ChangeLog | 12 +++++++++++ gdb/testsuite/gdb.python/py-cmd.exp | 9 ++------ gdb/testsuite/gdb.python/py-frame.exp | 9 ++------ gdb/testsuite/gdb.python/py-function.exp | 9 ++------ gdb/testsuite/gdb.python/py-prettyprint.exp | 10 +++------ gdb/testsuite/gdb.python/py-template.exp | 9 ++------ gdb/testsuite/gdb.python/py-type.exp | 23 ++++++++++----------- gdb/testsuite/gdb.python/py-value.exp | 9 ++------ gdb/testsuite/lib/gdb.exp | 15 ++++++++++++++ 9 files changed, 51 insertions(+), 54 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 701055312fd..c81edff9c73 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2010-02-24 Phil Muldoon + + PR python/11314 + * lib/gdb.exp (skip_python_tests): New function. + * gdb.python/py-cmd.exp: Use skip_python_tests. + * gdb.python/py-frame.exp: Likewise. + * gdb.python/py-function.exp: Likewise. + * gdb.python/py-prettyprint.exp: Likewise. + * gdb.python/py-template.exp: Likewise. + * gdb.python/py-type.exp: Likewise. + * gdb.python/py-value.exp: Likewise. + 2010-02-22 Pedro Alves PR9605 diff --git a/gdb/testsuite/gdb.python/py-cmd.exp b/gdb/testsuite/gdb.python/py-cmd.exp index 2a3ed0d7f1c..d3c05ff45f3 100644 --- a/gdb/testsuite/gdb.python/py-cmd.exp +++ b/gdb/testsuite/gdb.python/py-cmd.exp @@ -44,13 +44,8 @@ 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 $" {} -} +# Skip all tests if Python scripting is not enabled. +if { [skip_python_tests] } { continue } # Test a simple command. diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp index 86fe660b312..698920799d2 100644 --- a/gdb/testsuite/gdb.python/py-frame.exp +++ b/gdb/testsuite/gdb.python/py-frame.exp @@ -46,13 +46,8 @@ 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 $" {} -} +# Skip all tests if Python scripting is not enabled. +if { [skip_python_tests] } { continue } # The following tests require execution. diff --git a/gdb/testsuite/gdb.python/py-function.exp b/gdb/testsuite/gdb.python/py-function.exp index 461295de42e..38c56934907 100644 --- a/gdb/testsuite/gdb.python/py-function.exp +++ b/gdb/testsuite/gdb.python/py-function.exp @@ -44,13 +44,8 @@ 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 $" {} -} +# Skip all tests if Python scripting is not enabled. +if { [skip_python_tests] } { continue } gdb_py_test_multiple "input convenience function" \ "python" "" \ diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp index 26268950d44..414362b13bf 100644 --- a/gdb/testsuite/gdb.python/py-prettyprint.exp +++ b/gdb/testsuite/gdb.python/py-prettyprint.exp @@ -27,13 +27,9 @@ set binfile ${objdir}/${subdir}/${testfile} # Start with a fresh gdb. gdb_exit gdb_start -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 $" {} -} + +# 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. diff --git a/gdb/testsuite/gdb.python/py-template.exp b/gdb/testsuite/gdb.python/py-template.exp index 713ad5f3763..9089de6ff3d 100644 --- a/gdb/testsuite/gdb.python/py-template.exp +++ b/gdb/testsuite/gdb.python/py-template.exp @@ -35,13 +35,8 @@ 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 $" {} -} +# Skip all tests if Python scripting is not enabled. +if { [skip_python_tests] } { continue } proc test_template_arg {type} { global testfile srcdir subdir srcfile binfile diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp index ef74d8712b9..63117ade3aa 100644 --- a/gdb/testsuite/gdb.python/py-type.exp +++ b/gdb/testsuite/gdb.python/py-type.exp @@ -34,8 +34,8 @@ proc build_inferior {lang} { } } -# Restart GDB, set breakpoint and run to that breakpoint. -proc restart_gdb {bp} { +# Restart GDB. +proc restart_gdb {} { global srcdir subdir srcfile binfile testfile hex gdb_exit @@ -47,12 +47,14 @@ proc restart_gdb {bp} { perror "couldn't run to breakpoint" return } +} +# Set breakpoint and run to that breakpoint. +proc runto_bp {bp} { gdb_breakpoint [gdb_get_line_number $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} { @@ -127,21 +129,18 @@ proc test_range {} { # Perform C Tests. build_inferior "c" -restart_gdb "break to inspect struct and array." +restart_gdb -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 $" {} -} +# Skip all tests if Python scripting is not enabled. +if { [skip_python_tests] } { continue } +runto_bp "break to inspect struct and array." test_fields "c" # Perform C++ Tests. build_inferior "c++" -restart_gdb "break to inspect struct and array." +restart_gdb +runto_bp "break to inspect struct and array." test_fields "c++" test_base_class test_range diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp index d980a3d603a..2b18e02c41d 100644 --- a/gdb/testsuite/gdb.python/py-value.exp +++ b/gdb/testsuite/gdb.python/py-value.exp @@ -394,13 +394,8 @@ 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 $" {} -} +# Skip all tests if Python scripting is not enabled. +if { [skip_python_tests] } { continue } test_value_creation test_value_numeric_ops diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 627941d6d1e..8c18f331e16 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1299,6 +1299,21 @@ proc skip_java_tests {} { return 0 } +# Return a 1 for configurations that do not support Python scripting. + +proc skip_python_tests {} { + global gdb_prompt + gdb_test_multiple "python print 'test'" "verify python support" { + -re "not supported.*$gdb_prompt $" { + unsupported "Python support is disabled." + return 1 + } + -re "$gdb_prompt $" {} + } + + return 0 +} + # Return a 1 if we should skip shared library tests. proc skip_shlib_tests {} { -- 2.30.2