Move foreach_with_prefix to lib/gdb.exp

gdb/testsuite/ChangeLog:
2016-01-25  Pedro Alves  <palves@redhat.com>

	* gdb.base/step-sw-breakpoint-adjust-pc.exp (foreach_with_prefix):
	Delete, moved to lib/gdb.exp.
	* gdb.threads/forking-threads-plus-breakpoint.exp
	(foreach_with_prefix): Likewise.
	* gdb.threads/process-dies-while-handling-bp.exp
	(foreach_with_prefix): Likewise.
	* lib/gdb.exp (foreach_with_prefix): New procedure.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8fe983eb9648232393554cb7e32e55374aa2774b..aea573d87fa500f3dceaaf400991dfc7bc617392 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2016-01-25  Pedro Alves  <palves@redhat.com>
+
+       * gdb.base/step-sw-breakpoint-adjust-pc.exp (foreach_with_prefix):
+       Delete, moved to lib/gdb.exp.
+       * gdb.threads/forking-threads-plus-breakpoint.exp
+       (foreach_with_prefix): Likewise.
+       * gdb.threads/process-dies-while-handling-bp.exp
+       (foreach_with_prefix): Likewise.
+       * lib/gdb.exp (foreach_with_prefix): New procedure.
+
 2016-01-25  Marcin Kościelnicki  <koriakin@0x04.net>
 
        * gdb.trace/backtrace.exp: Bump stack collection fudge factor.

diff --git a/gdb/testsuite/gdb.base/step-sw-breakpoint-adjust-pc.exp b/gdb/testsuite/gdb.base/step-sw-breakpoint-adjust-pc.exp
index 378d71c2750c79d5dbd50bb167966cabdc91f7ef..28ffbe73389b11c102fb1fc747626e02403efe78 100644 (file)
--- a/gdb/testsuite/gdb.base/step-sw-breakpoint-adjust-pc.exp
+++ b/gdb/testsuite/gdb.base/step-sw-breakpoint-adjust-pc.exp
@@ -73,18 +73,6 @@ proc test {non_stop displaced always_inserted} {
     }
 }
 
-# Wrapper for foreach that calls with_test_prefix on each iteration,
-# including the iterator's current value in the prefix.
-
-proc foreach_with_prefix {var list body} {
-    upvar 1 $var myvar
-    foreach myvar $list {
-       with_test_prefix "$var=$myvar" {
-           uplevel 1 $body
-       }
-    }
-}
-
 foreach_with_prefix non_stop { "off" "on" } {
     foreach_with_prefix displaced_step { "off" "on" } {
        foreach_with_prefix always_inserted { "off" "on" } {

diff --git a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
index d2041255603addcdb625112c9eabb7a14bfdf09b..b5f7c21068f6b555540ed09adaa6357623be1e38 100644 (file)
--- a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
+++ b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
@@ -92,18 +92,6 @@ proc do_test { cond_bp_target detach_on_fork } {
        "only inferior 1 left"
 }
 
-# Wrapper for foreach that calls with_test_prefix on each iteration,
-# including the iterator's current value in the prefix.
-
-proc foreach_with_prefix {var list body} {
-    upvar 1 $var myvar
-    foreach myvar $list {
-       with_test_prefix "$var=$myvar" {
-           uplevel 1 $body
-       }
-    }
-}
-
 foreach_with_prefix cond_bp_target {1 0} {
     foreach_with_prefix detach_on_fork {"on" "off"} {
        do_test $cond_bp_target $detach_on_fork

diff --git a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp b/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
index 8605a383dde044e0a308b3abc5bbcfeddc1a96ee..2db31afce11f2a988b199daeab362a8495bfa8d2 100644 (file)
--- a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
+++ b/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
@@ -128,18 +128,6 @@ proc do_test { non_stop cond_bp_target } {
        "no threads left"
 }
 
-# Wrapper for foreach that calls with_test_prefix on each iteration,
-# including the iterator's current value in the prefix.
-
-proc foreach_with_prefix {var list body} {
-    upvar 1 $var myvar
-    foreach myvar $list {
-       with_test_prefix "$var=$myvar" {
-           uplevel 1 $body
-       }
-    }
-}
-
 foreach_with_prefix non_stop {"on" "off"} {
     foreach_with_prefix cond_bp_target {1 0} {
        do_test $non_stop $cond_bp_target

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index e6fe62c8f01f146a4a250d5a1d16eb1530135afa..66821ebec561dde48f0ebb077e30e16cbf49ab5b 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1906,6 +1906,18 @@ proc with_test_prefix { prefix body } {
   }
 }
 
+# Wrapper for foreach that calls with_test_prefix on each iteration,
+# including the iterator's name and current value in the prefix.
+
+proc foreach_with_prefix {var list body} {
+    upvar 1 $var myvar
+    foreach myvar $list {
+       with_test_prefix "$var=$myvar" {
+           uplevel 1 $body
+       }
+    }
+}
+
 # Run BODY in the context of the caller.  After BODY is run, the variables
 # listed in VARS will be reset to the values they had before BODY was run.
 #