From patchwork Mon Feb 1 23:24:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 10696 Received: (qmail 69013 invoked by alias); 1 Feb 2016 23:24:25 -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 68998 invoked by uid 89); 1 Feb 2016 23:24:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_40, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=deleting, y*, H*M:sk:001a113, H*MI:sk:001a113 X-HELO: mail-pa0-f74.google.com Received: from mail-pa0-f74.google.com (HELO mail-pa0-f74.google.com) (209.85.220.74) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Mon, 01 Feb 2016 23:24:23 +0000 Received: by mail-pa0-f74.google.com with SMTP id y7so718598paa.1 for ; Mon, 01 Feb 2016 15:24:23 -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=nB6tOrmJOuHusdnQIUXmqnO6JIR1rivkRjP+Uec3NeE=; b=D1LNT6xT9PjdoTdVt87C+5tfxiZR8WFV9Bl+1ueSfE5yCSIIwQthBZpZF3oXWQoKUz OnmIiJDPTYNAxx/I8w8v8qI3NSv96N0C+5SFuO2hM228HRb1v+ylM8M47DuINcDAHswX fNppbbl38S0oIkH++x/PkdjrVFzyp2BfyJuMtCEVZlsvCM9hR7EO4duVmrw0MOhyhej/ 4LoBqnGjCWcG2UGwjklCtXsQNeJTzLbSxSs0N0pGCgmPyxN7JlqDIANUCqByTCXTtfx4 Vl9hVQq3PH+WEPxqgjwbwLQLOQ4Sp1fSLGS2ze0OeAHCZlLegyQ2zMGBbMEN29gfJX2f kSfA== X-Gm-Message-State: AG10YOQCNz+5AVyPRY1PKFlI+zy1cuYoTXf9B6r0s53jWZ9/qOCtgpPpCNXgge93t3qAWYhsoU8eWbij/8MaWBxWUYqBnEMaxKnTZFT2xTVUtywlB8pVN/mzjVrHikXFCpRZGzFAs+2xgdw1WDuw8lGl1Utr9ksxgfpYuGmoD3THWmgeTO3nUw== MIME-Version: 1.0 X-Received: by 10.98.93.84 with SMTP id r81mr26440506pfb.4.1454369061340; Mon, 01 Feb 2016 15:24:21 -0800 (PST) Message-ID: <001a11379d60464eec052abdaf9e@google.com> Date: Mon, 01 Feb 2016 23:24:21 +0000 Subject: [OB PATCH] gdb.base/skip.exp: Clean up multiple references to same test name. From: Doug Evans To: gdb-patches@sourceware.org X-IsSubscribed: yes Hi. This is just some simple cleanup in preparation for a followup patch. Committed as obvious. 2016-02-01 Doug Evans * gdb.base/skip.exp: Clean up multiple references to same test name. diff --git a/gdb/testsuite/gdb.base/skip.exp b/gdb/testsuite/gdb.base/skip.exp index 3fda8d5..9fa4acf 100644 --- a/gdb/testsuite/gdb.base/skip.exp +++ b/gdb/testsuite/gdb.base/skip.exp @@ -100,9 +100,10 @@ gdb_test "info skip" \ "info skip (delete 1)" if ![runto_main] { fail "skip tests suppressed" } -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)" +set test "step after deleting 1" +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 @@ -114,11 +115,12 @@ gdb_test "info skip 3" ".*\\n3\\s+file\\s+n.*" \ "info skip shows entry as disabled" if ![runto_main] { fail "skip tests suppressed" } -gdb_test "step" "bar \\(\\) at.*" "step after disabling 3 (1)" -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)" +set test "step after disabling 3" +gdb_test "step" "bar \\(\\) at.*" "$test (1)" +gdb_test "step" ".*" "$test (2)"; # Return from foo() +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. @@ -128,9 +130,10 @@ 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 enable 3 (1)" -gdb_test "step" ".*" "step after enable 3 (2)"; # Return from foo() -gdb_test "step" "main \\(\\) at.*" "step after enable 3 (3)" +set test "step after enable 3" +gdb_test "step" "foo \\(\\) at.*" "$test (1)" +gdb_test "step" ".*" "$test (2)"; # Return from foo() +gdb_test "step" "main \\(\\) at.*" "$test (3)" gdb_test "skip disable" gdb_test "info skip" \