From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14528 invoked by alias); 30 Jan 2012 23:58:16 -0000 Received: (qmail 14412 invoked by uid 22791); 30 Jan 2012 23:58:13 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 30 Jan 2012 23:57:57 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1Rs16i-0001K5-29 from Yao_Qi@mentor.com ; Mon, 30 Jan 2012 15:57:56 -0800 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 30 Jan 2012 15:57:37 -0800 Received: from [127.0.0.1] (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.1.289.1; Mon, 30 Jan 2012 15:57:54 -0800 Message-ID: <4F272E83.4060503@codesourcery.com> Date: Tue, 31 Jan 2012 01:56:00 -0000 From: Yao Qi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:9.0) Gecko/20111220 Thunderbird/9.0 MIME-Version: 1.0 To: Pedro Alves CC: Subject: Re: [patch] Fix identical PASS in gdb.base/skip.exp References: <4F26A994.8060500@codesourcery.com> <4F26C39A.1000200@redhat.com> In-Reply-To: <4F26C39A.1000200@redhat.com> Content-Type: multipart/mixed; boundary="------------050308020703080208060901" 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: 2012-01/txt/msg01005.txt.bz2 --------------050308020703080208060901 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Content-length: 2808 On 01/31/2012 12:21 AM, Pedro Alves wrote: >> > -gdb_test "step" >> > +gdb_test "step" ".*" "step into main" > into, or in? AFAICS, you're already in main before the step. > OK, Change this message to "step in the main". >> > gdb_test "bt" "\\s*\\#0\\s+main.*" "step after all ignored" >> > >> > # >> > @@ -96,11 +96,12 @@ gdb_test "info skip" \ >> > "Num\\s+Type\\s+Enb\\s+Address\\s+What\\s* >> > 2\\s+function\\s+y\\s+0x\[0-9a-f\]+ main at .*$srcfile:\[0-9\]+\\s* >> > 3\\s+file\\s+y\\s+.*$srcfile1\\s* >> > -4\\s+function\\s+y\\s+0x\[0-9a-f\]+ baz at .*$srcfile1:\[0-9\]+\\s*" >> > +4\\s+function\\s+y\\s+0x\[0-9a-f\]+ baz at .*$srcfile1:\[0-9\]+\\s*" \ >> > + "info skip (delete 1)" >> > >> > if ![runto_main] { fail "skip tests suppressed" } >> > gdb_test "step" "foo \\(\\) at.*" "step after deleting 1 (1)" >> > -gdb_test "step"; # Return from foo() >> > +gdb_test "step" ".*" "step after deleting 1" ; # Return from foo() >> > gdb_test "step" "main \\(\\) at.*" "step after deleting 1 (2)" > Shouldn't that be > > gdb_test "step" "foo \\(\\) at.*" "step after deleting 1 (1)" > gdb_test "step" ".*" "step after deleting 1 (2)" # Return from foo() > gdb_test "step" "main \\(\\) at.*" "step after deleting 1 (3)" > > ? That is: 1, 2, 3. > OK fixed. >> > >> > # >> > @@ -114,10 +115,10 @@ gdb_test "info skip 3" ".*\\n3\\s+file\\s+n.*" \ >> > >> > if ![runto_main] { fail "skip tests suppressed" } >> > gdb_test "step" "bar \\(\\) at.*" "step after disabling 3 (1)" >> > -gdb_test "step"; # Return from foo() >> > -gdb_test "step" "foo \\(\\) at.*" "step after disabling 3 (2)" >> > -gdb_test "step"; # Return from bar() >> > -gdb_test "step" "main \\(\\) at.*" "step after disabling 3 (3)" >> > +gdb_test "step" ".*" "step after disabling 3 (2)"; # Return from foo() >> > +gdb_test "step" "foo \\(\\) at.*" "step after disabling 3 (3)" >> > +gdb_test "step" ".*" "step after disabling 3 (4)"; # Return from bar() >> > +gdb_test "step" "main \\(\\) at.*" "step after disabling 3 (5)" >> > >> > # >> > # Enable skiplist entry 3 and make sure we step over it like before. >> > @@ -127,9 +128,9 @@ gdb_test "skip enable 3" >> > gdb_test "info skip 3" ".*\\n3\\s+file\\s+y.*" \ >> > "info skip shows entry as enabled" >> > if ![runto_main] { fail "skip tests suppressed" } >> > -gdb_test "step" "foo \\(\\) at.*" "step after deleting 1 (1)" >> > -gdb_test "step"; # Return from foo() >> > -gdb_test "step" "main \\(\\) at.*" "step after deleting 1 (2)" >> > +gdb_test "step" "foo \\(\\) at.*" "step after enable 3 (1)" >> > +gdb_test "step" ".*" "step after enable 3"; # Return from foo() >> > +gdb_test "step" "main \\(\\) at.*" "step after enable 3 (2)" > 1, 2, 3? > Fixed. > Okay with those fixed. The patch here is what I committed. -- Yao (齐尧) --------------050308020703080208060901 Content-Type: text/x-patch; name="0005-make-test-PASS-unique.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0005-make-test-PASS-unique.patch" Content-length: 3777 2012-01-30 Yao Qi * gdb.base/skip.exp: Make test result unique. --- gdb/testsuite/gdb.base/skip.exp | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/gdb/testsuite/gdb.base/skip.exp b/gdb/testsuite/gdb.base/skip.exp index 061341c..5cb1424 100644 --- a/gdb/testsuite/gdb.base/skip.exp +++ b/gdb/testsuite/gdb.base/skip.exp @@ -27,9 +27,9 @@ 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." +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." +gdb_test "skip" "No default function now." "skip (no default function)" if ![runto_main] { fail "skip tests suppressed" } @@ -41,8 +41,8 @@ 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\." -gdb_test "skip" "Function main at .* will be skipped when stepping\." +gdb_test "skip file" "File .*$srcfile will be skipped when stepping\." "skip file ($srcfile)" +gdb_test "skip" "Function main at .* will be skipped when stepping\." "skip (main)" # # Create a skiplist entry for a specified file and function. @@ -82,7 +82,7 @@ gdb_test "info skip" \ # if ![runto_main] { fail "skip tests suppressed" } -gdb_test "step" +gdb_test "step" ".*" "step in the main" gdb_test "bt" "\\s*\\#0\\s+main.*" "step after all ignored" # @@ -96,12 +96,13 @@ gdb_test "info skip" \ "Num\\s+Type\\s+Enb\\s+Address\\s+What\\s* 2\\s+function\\s+y\\s+0x\[0-9a-f\]+ main at .*$srcfile:\[0-9\]+\\s* 3\\s+file\\s+y\\s+.*$srcfile1\\s* -4\\s+function\\s+y\\s+0x\[0-9a-f\]+ baz at .*$srcfile1:\[0-9\]+\\s*" +4\\s+function\\s+y\\s+0x\[0-9a-f\]+ baz at .*$srcfile1:\[0-9\]+\\s*" \ + "info skip (delete 1)" if ![runto_main] { fail "skip tests suppressed" } gdb_test "step" "foo \\(\\) at.*" "step after deleting 1 (1)" -gdb_test "step"; # Return from foo() -gdb_test "step" "main \\(\\) at.*" "step after deleting 1 (2)" +gdb_test "step" ".*" "step after deleting 1 (2)" ; # Return from foo() +gdb_test "step" "main \\(\\) at.*" "step after deleting 1 (3)" # # Now disable the skiplist entry for skip1.c. We should now @@ -114,10 +115,10 @@ gdb_test "info skip 3" ".*\\n3\\s+file\\s+n.*" \ if ![runto_main] { fail "skip tests suppressed" } gdb_test "step" "bar \\(\\) at.*" "step after disabling 3 (1)" -gdb_test "step"; # Return from foo() -gdb_test "step" "foo \\(\\) at.*" "step after disabling 3 (2)" -gdb_test "step"; # Return from bar() -gdb_test "step" "main \\(\\) at.*" "step after disabling 3 (3)" +gdb_test "step" ".*" "step after disabling 3 (2)"; # Return from foo() +gdb_test "step" "foo \\(\\) at.*" "step after disabling 3 (3)" +gdb_test "step" ".*" "step after disabling 3 (4)"; # Return from bar() +gdb_test "step" "main \\(\\) at.*" "step after disabling 3 (5)" # # Enable skiplist entry 3 and make sure we step over it like before. @@ -127,9 +128,9 @@ gdb_test "skip enable 3" gdb_test "info skip 3" ".*\\n3\\s+file\\s+y.*" \ "info skip shows entry as enabled" if ![runto_main] { fail "skip tests suppressed" } -gdb_test "step" "foo \\(\\) at.*" "step after deleting 1 (1)" -gdb_test "step"; # Return from foo() -gdb_test "step" "main \\(\\) at.*" "step after deleting 1 (2)" +gdb_test "step" "foo \\(\\) at.*" "step after enable 3 (1)" +gdb_test "step" ".*" "step after enable 3 (2)"; # Return from foo() +gdb_test "step" "main \\(\\) at.*" "step after enable 3 (3)" gdb_test "skip disable" gdb_test "info skip" \ -- 1.7.0.4 --------------050308020703080208060901--