From patchwork Tue Feb 16 20:43:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 10876 Received: (qmail 13869 invoked by alias); 16 Feb 2016 20:43:05 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 13845 invoked by uid 89); 16 Feb 2016 20:43:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=evans, Evans, H*F:U*dje, 1229 X-HELO: mail-pf0-f201.google.com Received: from mail-pf0-f201.google.com (HELO mail-pf0-f201.google.com) (209.85.192.201) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 16 Feb 2016 20:43:02 +0000 Received: by mail-pf0-f201.google.com with SMTP id c10so16867971pfc.0 for ; Tue, 16 Feb 2016 12:43:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:message-id:date:subject:from:to :content-type; bh=gt/CLa3Y+SxIBIiO05qxRDmZhUYyyqIkGLIcrndIHCs=; b=QVTozvC7W8d1/15/BUYYPunmF3spJYvcMTM2OKHYmtnM9pWBvXFp7W/+ehkeDo8vW6 5I+UifkKoEJUp5BpMorZcO2Q9hG3Co7y+TlcXYtkXCwYGSaCihxsxOT8oy7+WigXR79V zig+BRj/9eISb+3ghju6YjoevVRhfm1P2SxZ/gA+CHDhSM44vAKNzi1Owr8Y2A4ATvc3 UsTOr2hBzCg6n2LYoREHw1JmpARiXxRCZwzXuA5Zw8CvK3R8V6yZdEc4ZqUvM6j39v7j K1dFAXaS9cThVci6BalwBBIQcDpaOSZpKfgWnq4m5cc3xLGMwtS/gBRQLSfB1fBR5Y7r I8Sw== X-Gm-Message-State: AG10YOTh39x26hdrumAsNfM5jfWqV/UDmPg1kUmRaHJzP5VvHHYt8B7TPa25XAjCSNG6qr/amzpwPrz0njbyctPIprNuR36zdZ0qZ4Qyz7JvViDKEBjtXT6s8DggvFmz5Wt2TP6sOIhown/nVap0hZRPTsXOSEXRPEG0iluAjAL+kiJ4veWCCw== MIME-Version: 1.0 X-Received: by 10.66.193.225 with SMTP id hr1mr23188838pac.34.1455655381029; Tue, 16 Feb 2016 12:43:01 -0800 (PST) Message-ID: <047d7bf16408e720fb052be92d63@google.com> Date: Tue, 16 Feb 2016 20:43:01 +0000 Subject: [OB PATCH] whitespace cleanup for skip testcase From: Doug Evans To: gdb-patches@sourceware.org X-IsSubscribed: yes Hi. fyi, I committed the following. [prep work for a followup patch] 2016-02-16 Doug Evans * gdb.base/skip.c: Add copyright. Whitespace cleanup. * gdb.base/skip1.c: Ditto. * gdb.base/skip.exp: Whitespace cleanup. } diff --git a/gdb/testsuite/gdb.base/skip.c b/gdb/testsuite/gdb.base/skip.c index 1467fe3..3568296 100644 --- a/gdb/testsuite/gdb.base/skip.c +++ b/gdb/testsuite/gdb.base/skip.c @@ -1,14 +1,35 @@ -int foo(); -int bar(); -int baz(int); +/* This testcase is part of GDB, the GNU debugger. -int main() + Copyright 2011-2016 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 + +int foo (void); +int bar (void); +int baz (int); + +int +main () { - /* Use comma operator to sequence evaluation of bar and foo. */ - return baz((bar(), foo())); + /* Use comma operator to sequence evaluation of bar and foo. */ + return baz ((bar (), foo ())); } -int foo() +int +foo () { return 0; } diff --git a/gdb/testsuite/gdb.base/skip.exp b/gdb/testsuite/gdb.base/skip.exp index 9fa4acf..40f3103 100644 --- a/gdb/testsuite/gdb.base/skip.exp +++ b/gdb/testsuite/gdb.base/skip.exp @@ -24,35 +24,30 @@ if { [prepare_for_testing skip.exp "skip" \ set srcfile skip.c set srcfile1 skip1.c -# # Right after we start gdb, there's no default file or function to skip. -# + gdb_test "skip file" "No default file now." "skip file (no default file)" gdb_test "skip function" "No default function now." gdb_test "skip" "No default function now." "skip (no default function)" if ![runto_main] { fail "skip tests suppressed" } -# # Test |info skip| with an empty skiplist. -# + gdb_test "info skip" "Not skipping any files or functions\." "info skip empty" -# # Create a skiplist entry for the current file and function. -# + gdb_test "skip file" "File .*$srcfile will be skipped when stepping\." "skip file ($srcfile)" gdb_test "skip" "Function main will be skipped when stepping\." "skip (main)" -# # Create a skiplist entry for a specified file and function. -# + gdb_test "skip file skip1.c" "File .*$srcfile1 will be skipped when stepping\." gdb_test "skip function baz" "Function baz will be skipped when stepping\." -# # Test bad skiplist entry modification commands -# + gdb_test "skip enable 999" "No skiplist entries found with number 999." gdb_test "skip disable 999" "No skiplist entries found with number 999." gdb_test "skip delete 999" "No skiplist entries found with number 999." @@ -60,14 +55,12 @@ gdb_test "skip enable a" "Args must be numbers or '\\$' variables." gdb_test "skip disable a" "Args must be numbers or '\\$' variables." gdb_test "skip delete a" "Args must be numbers or '\\$' variables." -# # Ask for info on a skiplist entry which doesn't exist. -# + gdb_test "info skip 999" "No skiplist entries found with number 999." -# # Does |info skip| look right? -# + gdb_test "info skip" \ "Num\\s+Type\\s+Enb\\s+What\\s* 1\\s+file\\s+y\\s+.*$srcfile\\s* @@ -75,21 +68,18 @@ gdb_test "info skip" \ 3\\s+file\\s+y\\s+$srcfile1\\s* 4\\s+function\\s+y\\s+baz\\s*" -# # Right now, we have an outstanding skiplist entry on both source # files, so when we step into the first line in main(), we should step # right over it and go to the second line of main(). -# if ![runto_main] { fail "skip tests suppressed" } gdb_test "step" ".*" "step in the main" gdb_test "bt" "\\s*\\#0\\s+main.*" "step after all ignored" -# # Now remove skip.c from the skiplist. Our first step should take us # into foo(), and our second step should take us to the next line in # main(). -# + gdb_test "skip delete 1" # Check that entry 1 is missing from |info skip| gdb_test "info skip" \ @@ -105,10 +95,9 @@ gdb_test "step" "foo \\(\\) at.*" "$test (1)" gdb_test "step" ".*" "$test (2)" ; # Return from foo() gdb_test "step" "main \\(\\) at.*" "$test (3)" -# # Now disable the skiplist entry for skip1.c. We should now # step into foo(), then into bar(), but not into baz(). -# + gdb_test "skip disable 3" # Is entry 3 disabled in |info skip|? gdb_test "info skip 3" ".*\\n3\\s+file\\s+n.*" \ @@ -122,9 +111,8 @@ gdb_test "step" "foo \\(\\) at.*" "$test (3)" gdb_test "step" ".*" "$test (4)"; # Return from bar() gdb_test "step" "main \\(\\) at.*" "$test (5)" -# # Enable skiplist entry 3 and make sure we step over it like before. -# + gdb_test "skip enable 3" # Is entry 3 enabled in |info skip|? gdb_test "info skip 3" ".*\\n3\\s+file\\s+y.*" \ diff --git a/gdb/testsuite/gdb.base/skip1.c b/gdb/testsuite/gdb.base/skip1.c index fe63cd6..9a06e62 100644 --- a/gdb/testsuite/gdb.base/skip1.c +++ b/gdb/testsuite/gdb.base/skip1.c @@ -1,9 +1,28 @@ -int bar() +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2011-2016 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 . */ + +int +bar (void) { return 1; } -int baz(int a) +int +baz (int a) { return a + 1;