diff mbox

[OB] gdb.base/skip.exp: Clean up multiple references to same test name.

Message ID 001a11379d60464eec052abdaf9e@google.com
State New
Headers show

Commit Message

Doug Evans Feb. 1, 2016, 11:24 p.m. UTC
Hi.

This is just some simple cleanup in preparation for a followup patch.

Committed as obvious.

2016-02-01  Doug Evans  <dje@google.com>

	* gdb.base/skip.exp: Clean up multiple references to same test name.
diff mbox

Patch

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" \