From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3026 invoked by alias); 18 Aug 2010 23:55:42 -0000 Received: (qmail 3014 invoked by uid 22791); 18 Aug 2010 23:55:40 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 18 Aug 2010 23:55:30 +0000 Received: (qmail 31374 invoked from network); 18 Aug 2010 23:55:28 -0000 Received: from unknown (HELO orlando.localnet) (pedro@127.0.0.2) by mail.codesourcery.com with ESMTPA; 18 Aug 2010 23:55:28 -0000 From: Pedro Alves To: gdb-patches@sourceware.org Subject: Re: [patch] Add solib_address and decode_line Python functionality Date: Wed, 18 Aug 2010 23:55:00 -0000 User-Agent: KMail/1.13.2 (Linux/2.6.33-29-realtime; KDE/4.4.2; x86_64; ; ) Cc: Phil Muldoon References: <4C44728D.4040408@redhat.com> In-Reply-To: <4C44728D.4040408@redhat.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201008190055.26266.pedro@codesourcery.com> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-08/txt/msg00324.txt.bz2 On Monday 19 July 2010 16:43:09, Phil Muldoon wrote: > 2010-07-19 Phil Muldoon > > * gdb.python/python.c: New File. > * gdb.python/python-sl.c: New File. > * gdb.python/python.exp: Test solib_address and decode_line > * functions. > This made it so that python.exp is untested on targets that do not support shared libraries (e.g., arm-eabi), despite the host supporting python. I don't suppose you see a problem with splitting these new tests out into their own files? I've added a python-1.c file so that python.exp still sees two files, in case it is important to have more than one symtab. I've tested this on x86_64-linux, and I was trying to test python.exp on i686-mingw32 x arm-none-eabi, though it appears I'll have to give up on that for the moment due to system issues... -- Pedro Alves 2010-08-18 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.c: Mention python-1.c. * gdb.python/python.exp: Move shared library tests to py-shared.exp. --- gdb/testsuite/gdb.python/py-shared-sl.c | 26 ++++++++++ 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 +--------- 6 files changed, 162 insertions(+), 22 deletions(-) Index: src/gdb/testsuite/gdb.python/py-shared-sl.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ src/gdb/testsuite/gdb.python/py-shared-sl.c 2010-08-19 00:10:25.000000000 +0100 @@ -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; +} Index: src/gdb/testsuite/gdb.python/py-shared.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ src/gdb/testsuite/gdb.python/py-shared.c 2010-08-19 00:11:35.000000000 +0100 @@ -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. */ +} Index: src/gdb/testsuite/gdb.python/py-shared.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ src/gdb/testsuite/gdb.python/py-shared.exp 2010-08-19 00:24:46.000000000 +0100 @@ -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" Index: src/gdb/testsuite/gdb.python/python-1.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ src/gdb/testsuite/gdb.python/python-1.c 2010-08-19 00:09:32.000000000 +0100 @@ -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; +} Index: src/gdb/testsuite/gdb.python/python.c =================================================================== --- src.orig/gdb/testsuite/gdb.python/python.c 2010-08-11 13:48:24.000000000 +0100 +++ src/gdb/testsuite/gdb.python/python.c 2010-08-19 00:11:06.000000000 +0100 @@ -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); Index: src/gdb/testsuite/gdb.python/python.exp =================================================================== --- src.orig/gdb/testsuite/gdb.python/python.exp 2010-08-18 13:16:41.000000000 +0100 +++ src/gdb/testsuite/gdb.python/python.exp 2010-08-19 00:13:26.000000000 +0100 @@ -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(\"rando 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"