From e7fbb131d42983eec31231f8bb69cdd8d5a33ee6 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 19 Aug 2010 17:00:58 +0000 Subject: [PATCH] * gdb.python/py-shared.exp: New file, factored out from python.exp. * gdb.python/py-shared.c: New file. * gdb.python/py-shared-sl.c: New file. * gdb.python/python-1.c: New file. * gdb.python/python-sl.c: Delete. * gdb.python/python.c: Mention python-1.c. * gdb.python/python.exp: Move shared library tests to py-shared.exp. * gdb.python/Makefile.in (EXECUTABLES): Add py-shared and python. (MISCELLANEOUS): New. (clean mostlyclean): Also remove $MISCELLANEOUS. --- gdb/testsuite/ChangeLog | 15 +++++ gdb/testsuite/gdb.python/Makefile.in | 7 +- .../gdb.python/{python-sl.c => py-shared-sl.c} | 0 gdb/testsuite/gdb.python/py-shared.c | 28 ++++++++ gdb/testsuite/gdb.python/py-shared.exp | 77 ++++++++++++++++++++++ gdb/testsuite/gdb.python/python-1.c | 26 ++++++++ gdb/testsuite/gdb.python/python.c | 2 +- gdb/testsuite/gdb.python/python.exp | 25 ++----- 8 files changed, 156 insertions(+), 24 deletions(-) rename gdb/testsuite/gdb.python/{python-sl.c => py-shared-sl.c} (100%) create mode 100644 gdb/testsuite/gdb.python/py-shared.c create mode 100644 gdb/testsuite/gdb.python/py-shared.exp create mode 100644 gdb/testsuite/gdb.python/python-1.c diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 547deaf..bf19fd4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,18 @@ +2010-08-19 Pedro Alves + + * gdb.python/py-shared.exp: New file, factored out from + python.exp. + * gdb.python/py-shared.c: New file. + * gdb.python/py-shared-sl.c: New file. + * gdb.python/python-1.c: New file. + * gdb.python/python-sl.c: Delete. + * gdb.python/python.c: Mention python-1.c. + * gdb.python/python.exp: Move shared library tests to + py-shared.exp. + * gdb.python/Makefile.in (EXECUTABLES): Add py-shared and python. + (MISCELLANEOUS): New. + (clean mostlyclean): Also remove $MISCELLANEOUS. + 2010-08-19 Doug Evans PR exp/11926 diff --git a/gdb/testsuite/gdb.python/Makefile.in b/gdb/testsuite/gdb.python/Makefile.in index 660941d..aaa771a 100644 --- a/gdb/testsuite/gdb.python/Makefile.in +++ b/gdb/testsuite/gdb.python/Makefile.in @@ -2,14 +2,17 @@ VPATH = @srcdir@ srcdir = @srcdir@ EXECUTABLES = py-type py-value py-prettyprint py-template py-block \ - py-symbol py-mi py-breakpoint py-inferior py-infthread + py-symbol py-mi py-breakpoint py-inferior py-infthread \ + py-shared python + +MISCELLANEOUS = py-shared-sl.sl all info install-info dvi install uninstall installcheck check: @echo "Nothing to be done for $@..." clean mostlyclean: -rm -f *~ *.o *.ci - -rm -f core $(EXECUTABLES) + -rm -f core $(EXECUTABLES) $(MISCELLANEOUS) distclean maintainer-clean realclean: clean -rm -f Makefile config.status config.log diff --git a/gdb/testsuite/gdb.python/python-sl.c b/gdb/testsuite/gdb.python/py-shared-sl.c similarity index 100% rename from gdb/testsuite/gdb.python/python-sl.c rename to gdb/testsuite/gdb.python/py-shared-sl.c diff --git a/gdb/testsuite/gdb.python/py-shared.c b/gdb/testsuite/gdb.python/py-shared.c new file mode 100644 index 0000000..6ece116 --- /dev/null +++ b/gdb/testsuite/gdb.python/py-shared.c @@ -0,0 +1,28 @@ +/* This testcase is part of GDB, the GNU debugger. + + 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 . */ + +/* Shared library functions */ +extern void func1 (void); +extern int func2 (void); + +int +main (int argc, char *argv[]) +{ + func1 (); + func2 (); + return 0; /* Break to end. */ +} diff --git a/gdb/testsuite/gdb.python/py-shared.exp b/gdb/testsuite/gdb.python/py-shared.exp new file mode 100644 index 0000000..41394b4 --- /dev/null +++ b/gdb/testsuite/gdb.python/py-shared.exp @@ -0,0 +1,77 @@ +# Copyright (C) 2008, 2009, 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 . + +# This file is part of the GDB testsuite. + +if {[skip_shlib_tests]} { + return 0 +} + +set testfile "py-shared" +set srcfile ${testfile}.c +set libfile "py-shared-sl" +set libsrc ${libfile}.c +set library ${objdir}/${subdir}/${libfile}.sl +set binfile ${objdir}/${subdir}/${testfile} + +if { [gdb_compile_shlib ${srcdir}/${subdir}/${libsrc} ${library} "debug"] != "" } { + untested "Could not compile shared library." + return -1 +} + +set exec_opts [list debug shlib=${library}] + +if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } { + untested "Could not compile $binfile." + 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} + +# Skip all tests if Python scripting is not enabled. +if { [skip_python_tests] } { continue } + +# The following tests require execution. + +if ![runto_main] then { + fail "Can't run to main" + return 0 +} + +runto [gdb_get_line_number "Break to end."] + +# Test gdb.solib_name +gdb_test "p &func1" "" "func1 address" +gdb_py_test_silent_cmd "python func1 = gdb.history(0)" "Aquire func1 address" 1 +gdb_test "python print gdb.solib_name(long(func1))" "gdb/testsuite/gdb.python/py-shared-sl.sl" "test func1 solib location" + +gdb_test "p &main" "" "main address" +gdb_py_test_silent_cmd "python main = gdb.history(0)" "Aquire main address" 1 +gdb_test "python print gdb.solib_name(long(main))" "None" "test main solib location" diff --git a/gdb/testsuite/gdb.python/python-1.c b/gdb/testsuite/gdb.python/python-1.c new file mode 100644 index 0000000..579a74e --- /dev/null +++ b/gdb/testsuite/gdb.python/python-1.c @@ -0,0 +1,26 @@ +/* This testcase is part of GDB, the GNU debugger. + + 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 . */ + +void func1 () +{ + return; +} + +int func2 () +{ + return 0; +} diff --git a/gdb/testsuite/gdb.python/python.c b/gdb/testsuite/gdb.python/python.c index 750a90a..d1ab0cb 100644 --- a/gdb/testsuite/gdb.python/python.c +++ b/gdb/testsuite/gdb.python/python.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* Shared library function */ +/* In python-1.c. */ extern void func1 (void); extern int func2 (void); diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp index 1f4a2a8..8c36d7f 100644 --- a/gdb/testsuite/gdb.python/python.exp +++ b/gdb/testsuite/gdb.python/python.exp @@ -22,19 +22,11 @@ if $tracelevel then { set testfile "python" set srcfile ${testfile}.c -set libfile "python-sl" -set libsrc ${libfile}.c -set library ${objdir}/${subdir}/${libfile}.sl +set srcfile1 ${testfile}-1.c set binfile ${objdir}/${subdir}/${testfile} -if { [gdb_compile_shlib ${srcdir}/${subdir}/${libsrc} ${library} "debug"] != "" } { - untested "Could not compile shared library." - return -1 -} - -set exec_opts [list debug shlib=${library}] - -if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } { +if { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile1}" \ + ${binfile} executable {debug}] != "" } { untested "Could not compile $binfile." return -1 } @@ -192,14 +184,5 @@ gdb_test "python gdb.decode_line(\"randomfunc\")" \ gdb_py_test_silent_cmd "python symtab = gdb.decode_line(\"func1\")" "test decode_line func1()" 1 gdb_test "python print len(symtab)" "2" "Test decode_line func1 length" gdb_test "python print len(symtab\[1\])" "1" "Test decode_line func1 length" -gdb_test "python print symtab\[1\]\[0\].symtab" "gdb/testsuite/gdb.python/python-sl.c.*" "Test decode_line func1 filename" +gdb_test "python print symtab\[1\]\[0\].symtab" "gdb/testsuite/gdb.python/python-1.c.*" "Test decode_line func1 filename" gdb_test "python print symtab\[1\]\[0\].line" "19" "Test decode_line func1 line number" - -# Test gdb.solib_name -gdb_test "p &func1" "" "func1 address" -gdb_py_test_silent_cmd "python func1 = gdb.history(0)" "Aquire func1 address" 1 -gdb_test "python print gdb.solib_name(long(func1))" "gdb/testsuite/gdb.python/python-sl.sl" "test func1 solib location" - -gdb_test "p &main" "" "main address" -gdb_py_test_silent_cmd "python main = gdb.history(0)" "Aquire main address" 1 -gdb_test "python print gdb.solib_name(long(main))" "None" "test main solib location" -- 2.7.4