From 21b1f8d2fc29b7e0585dbdca72c0b8a8bf070a2e Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Tue, 16 Feb 2016 12:39:16 -0800 Subject: [PATCH] Whitespace cleanup for skip testcase. gdb/testsuite/ChangeLog: * gdb.base/skip.c: Add copyright. Whitespace cleanup. * gdb.base/skip1.c: Ditto. * gdb.base/skip.exp: Whitespace cleanup. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/skip.c | 35 ++++++++++++++++++++++++++------- gdb/testsuite/gdb.base/skip.exp | 32 ++++++++++-------------------- gdb/testsuite/gdb.base/skip1.c | 23 ++++++++++++++++++++-- 4 files changed, 65 insertions(+), 31 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 37b158790af..462ba707e15 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-02-16 Doug Evans + + * gdb.base/skip.c: Add copyright. Whitespace cleanup. + * gdb.base/skip1.c: Ditto. + * gdb.base/skip.exp: Whitespace cleanup. + 2016-02-16 Don Breazeal PR remote/19496 diff --git a/gdb/testsuite/gdb.base/skip.c b/gdb/testsuite/gdb.base/skip.c index 1467fe36913..35682960c10 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 9fa4acfe2fd..40f31037e22 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 fe63cd65779..9a06e6211a3 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; } -- 2.30.2