From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 54418 invoked by alias); 22 Oct 2018 14:19:01 -0000 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 Received: (qmail 54347 invoked by uid 89); 22 Oct 2018 14:18:58 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=regulation X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 22 Oct 2018 14:18:55 +0000 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9E3E580F94; Mon, 22 Oct 2018 14:18:54 +0000 (UTC) Received: from [127.0.0.1] (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id D138F1057048; Mon, 22 Oct 2018 14:18:53 +0000 (UTC) Subject: Re: [RFAv3 5/5] Add a test case for info args|functions|locals|variables [-q] [-t TYPEREGEXP] [NAMEREGEXP] To: Philippe Waroquiers , gdb-patches@sourceware.org References: <20180923214209.985-1-philippe.waroquiers@skynet.be> <20180923214209.985-6-philippe.waroquiers@skynet.be> From: Pedro Alves Message-ID: <0f46cdb0-4c14-2d1b-9f5f-410b32c0915d@redhat.com> Date: Mon, 22 Oct 2018 14:19:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20180923214209.985-6-philippe.waroquiers@skynet.be> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2018-10/txt/msg00476.txt.bz2 On 09/23/2018 10:42 PM, Philippe Waroquiers wrote: > Add a test case for info args|functions|locals|variables [-q] [-t TYPEREGEXP] [NAMEREGEXP] > > gdb/testsuite/ChangeLog > 2018-09-23 Philippe Waroquiers > > * gdb.base/info_qt.c: New file. > * gdb.base/info_qt.exp: New file. > --- > gdb/testsuite/gdb.base/info_qt.c | 81 ++++++++++ > gdb/testsuite/gdb.base/info_qt.exp | 234 +++++++++++++++++++++++++++++ > 2 files changed, 315 insertions(+) > create mode 100644 gdb/testsuite/gdb.base/info_qt.c > create mode 100644 gdb/testsuite/gdb.base/info_qt.exp > > diff --git a/gdb/testsuite/gdb.base/info_qt.c b/gdb/testsuite/gdb.base/info_qt.c > new file mode 100644 > index 0000000000..77c4ea8236 > --- /dev/null > +++ b/gdb/testsuite/gdb.base/info_qt.c > @@ -0,0 +1,81 @@ > +/* This testcase is part of GDB, the GNU debugger. > + > + Copyright 2018 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 . */ > + > +#include > +#include Are these two needed? > + > +typedef int entier; > + > +int info_qt_inc = 0; > +entier info_qt_ent = 0; > + > +static void > +setup_done (void) > +{ > +} > + > +static void > +setup (char arg_c, int arg_i, int arg_j) > +{ > + char loc_arg_c = arg_c; > + int loc_arg_i = arg_i; > + int loc_arg_j = arg_j; > + > + info_qt_inc += loc_arg_c + loc_arg_i + loc_arg_j; > + setup_done (); > +} > + > +void info_fun1 (void) > +{ > + info_qt_inc++; > + info_qt_ent++; > +} > + > +int info_fun2 (char c) > +{ > + info_qt_inc += c; > + return info_qt_inc; > +} > + > +int info_fun2bis (char c) > +{ > + info_qt_inc += c; > + return info_qt_inc; > +} > + > +entier info_fun2xxx (char arg_c, int arg_i, int arg_j) > +{ > + info_qt_inc += arg_c + arg_i + arg_j; > + return info_qt_inc; > +} > + > +entier info_fun2yyy (char arg_c, int arg_i, int arg_j) > +{ > + setup (arg_c, arg_i, arg_j); > + info_qt_inc += arg_c + arg_i + arg_j; > + return info_qt_inc; > +} > + > +int > +main (int argc, char **argv, char **envp) > +{ > + info_fun1 (); > + (void) info_fun2 ('a'); > + (void) info_fun2bis ('b'); > + (void) info_fun2xxx ('c', 1, 2); > + (void) info_fun2yyy ('d', 3, 4); > +} > diff --git a/gdb/testsuite/gdb.base/info_qt.exp b/gdb/testsuite/gdb.base/info_qt.exp > new file mode 100644 > index 0000000000..3ece05c5e4 > --- /dev/null > +++ b/gdb/testsuite/gdb.base/info_qt.exp > @@ -0,0 +1,234 @@ > +# This testcase is part of GDB, the GNU debugger. > + > +# Copyright 2018 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 test verifies that a macro using backtrace can be applied to all threads > +# and will continue for each thread even though an error may occur in > +# backtracing one of the threads. Err, nope, it does not, that was gdb.threads/threadapply.exp. :-) Please remove/update. > + > +# Test info [args|functions|locals|variables] [-q] [-t TYPEREGEXP] [NAMEREGEXP] Add some empty line here. > +standard_testfile > + > +if { [prepare_for_testing "failed to prepare" ${testfile}] } { > + return -1 > +} > + > +clean_restart ${binfile} > + > +if ![runto setup_done] then { > + gdb_suppress_tests We don't use gdb_suppress_tests anymore (for years). Please fail/return instead. > +} > +set any "\[^\r\n\]*" > +set ws "\[ \t\]\+" > +set number "\[0-9]\+" > + > + > +############# test 'info functions' > + > +# test simple matching with name regexp Please write complete sentences starting with uppercase and ending in a period. Here and throughout. > +foreach_with_prefix cmd { > + "info functions info_fun" > + "info functions -- info_fun" > + "info functions ^info_fun" } { > + gdb_test $cmd \ > + [multi_line \ > + "All functions matching regular expression \".*info_fun.*\":" \ > + "" \ > + "File .*info_qt.c:" \ > + "${number}: void info_fun1\\\(void\\\);" \ > + "${number}: int info_fun2\\\(char\\\);" \ > + "${number}: int info_fun2bis\\\(char\\\);" \ > + "${number}: entier info_fun2xxx\\\(char, int, int\\\);" \ > + "${number}: entier info_fun2yyy\\\(char, int, int\\\);" \ > + ] \ > + "info functions info_fun" > +} > + > +# test simple matching with name regexp, but with -q to avoid the first header > +foreach_with_prefix cmd { > + "info functions -q info_fun" > + "info functions -q -- info_fun" } { > + gdb_test $cmd \ > + [multi_line \ > + "" \ > + "File .*info_qt.c:" \ > + "${number}: void info_fun1\\\(void\\\);" \ > + "${number}: int info_fun2\\\(char\\\);" \ > + "${number}: int info_fun2bis\\\(char\\\);" \ > + "${number}: entier info_fun2xxx\\\(char, int, int\\\);" \ > + "${number}: entier info_fun2yyy\\\(char, int, int\\\);" \ > + ] \ > + "info functions -q info_fun" > +} > + > +# test -q and no matching functions > +foreach_with_prefix cmd { > + "info functions -q nowaythiscanmatch" > + "info functions -q -- -q" } { > + gdb_test $cmd "" "quiet info functions empty output" This matches any output before the gdb prompt. Use gdb_test_no_output instead. > +} > + > +# test with a type regexp > +foreach_with_prefix cmd { > + "info functions -t entier -q info_fun" > + "info functions -q -t 'entier (' -- info_fun" > + "info functions -q -t '(char, int, int)' -- info_fun" > + "info functions -q -t 'entier (char, int, int)' -- info_fun" } { > + gdb_test $cmd \ > + [multi_line \ > + "" \ > + "File .*info_qt.c:" \ > + "${number}: entier info_fun2xxx\\\(char, int, int\\\);" \ > + "${number}: entier info_fun2yyy\\\(char, int, int\\\);" \ > + ] \ > + "info functions -q info_fun" > +} > + > +# test with a non matching type regexp > +gdb_test "info functions -t ganze_Zahl -q info_fun" "" \ > + "quiet output info functions non matching type" > + > + > +############# test 'info variables' > + > +# test simple matching with name regexp > +foreach_with_prefix cmd { > + "info variables info_qt" > + "info variables -- info_qt" > + "info variables ^info_qt" } { > + gdb_test $cmd \ > + [multi_line \ > + "All variables matching regular expression \".*info_qt.*\":" \ > + "" \ > + "File .*info_qt.c:" \ > + "${number}: entier info_qt_ent;" \ > + "${number}: int info_qt_inc;" \ > + ] \ > + "info functions info_fun" > +} > + > +# test simple matching with name regexp, but with -q to avoid the first header > + > +# test -q and no matching variables > +foreach_with_prefix cmd { > + "info variables -q nowaythiscanmatch" > + "info variables -q -- -q" } { > + gdb_test $cmd "" "quiet info variables empty output" gdb_test_no_output. > +} > + > +# test with a type regexp > +foreach_with_prefix cmd { > + "info variables -t entier -q info_qt" > + "info variables -q -t entier -- info_qt" } { > + gdb_test $cmd \ > + [multi_line \ > + "" \ > + "File .*info_qt.c:" \ > + "${number}: entier info_qt_ent;" \ > + ] \ > + "info variables -q -t entier info_fun" > +} > + > +# test with a non matching type regexp > +gdb_test "info variables -t ganze_Zahl -q info_at" "" \ > + "quiet output info variables non matching type" gdb_test_no_output. > + > + > + > +############# test 'info args' in function setup. > + > +gdb_test "frame 1" ".* in setup .*" "set frame 1 for info args" > + > +# test name regexp matching all > +foreach_with_prefix cmd { > + "info args" > + "info args arg_" > + "info args g" > + "info args -- .*" } { > + gdb_test $cmd \ > + [multi_line \ > + "arg_c = 100 'd'" \ > + "arg_i = 3" \ > + "arg_j = 4" \ > + ] \ > + "info args" > +} > + > +# test name regexp or type regexp matching some > +foreach_with_prefix cmd { > + "info args -t int" > + "info args arg_[ij]"} { > + gdb_test $cmd \ > + [multi_line \ > + "arg_i = 3" \ > + "arg_j = 4" \ > + ] \ > + "info args" > +} Duplicate test names. Consider sing with_test_prefix to wrap groups of tests. > + > +gdb_test "info args nowaythiscanmatch" "No matching arguments." "non matching args" > +gdb_test "info args -q nowaythiscanmatch" "" "quiet non matching args" > +gdb_test "info args -q -t entier" "" "quiet non matching args with type" gdb_test_no_output. > + > +############# test 'info locals' in function setup. > + > +gdb_test "frame 1" ".* in setup .*" "set frame 1 for info locals" > + > +# test name regexp matching all > +foreach_with_prefix cmd { > + "info locals" > + "info locals loc_arg_" > + "info locals g" > + "info locals -- .*" } { > + gdb_test $cmd \ > + [multi_line \ > + "loc_arg_c = 100 'd'" \ > + "loc_arg_i = 3" \ > + "loc_arg_j = 4" \ > + ] \ > + "info locals" > +} > + > +# test name regexp or type regexp matching some > +foreach_with_prefix cmd { > + "info locals -t int" > + "info locals arg_[ij]" > + "info locals loc_arg_[ij]"} { > + gdb_test $cmd \ > + [multi_line \ > + "loc_arg_i = 3" \ > + "loc_arg_j = 4" \ > + ] \ > + "info args" > +} Note duplicate test name. > + > +gdb_test "info locals nowaythiscanmatch" "No matching locals." "non matching locals" > +gdb_test "info locals -q nowaythiscanmatch" "" "quiet non matching locals" > +gdb_test "info locals -q -t ganze_Zahl loc" "" "quiet non matching locals with type" These last two match anything. Use gdb_test_no_output instead. > + > +# verify that the rest of the args is taken as a single regexp > +gdb_test "info functions abc def" \ > + "All functions matching regular expression \\\"abc def\\\":" \ > + "single regexp" > + > +gdb_test "info functions -t uvw abc def" \ > + "All functions matching regular expression \\\"abc def\\\" with type matching regulation expression \\\"uvw\\\":" \ > + "-t noquote single regexp" > + > +gdb_test "info functions -t 'uvw xyz' abc def" \ > + "All functions matching regular expression \\\"abc def\\\" with type matching regulation expression \\\"uvw xyz\\\":" \ > + "-t quote single regexp" > Thanks, Pedro Alves