test, gcore: move capture_command_output into lib/gdb.exp

Allow gcore's capture_command_output function to be used by other tests.

testsuite/
	* gdb.base/gcore.exp (capture_command_output): Move ...
	* lib/gdb.exp (capture_command_output): ... here.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fdbae2573e922f112f2f2a45f7d11f6103591b8b..4c74ed1bce01efcb27aee09d3cd23bb7dc44ebae 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-23  Markus Metzger  <markus.t.metzger@intel.com>
+
+       * gdb.base/gcore.exp (capture_command_output): Move ...
+       * lib/gdb.exp (capture_command_output): ... here.
+
 2014-05-23  Markus Metzger  <markus.t.metzger@intel.com>
 
        * gdb.btrace/data.exp: Test memory access during btrace replay.

diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp
index 99743a0f584fc7f2950ddff3200c8528c353eaa4..c28a9b3f411d770036414d50f05ffba5355c2853 100644 (file)
--- a/gdb/testsuite/gdb.base/gcore.exp
+++ b/gdb/testsuite/gdb.base/gcore.exp
@@ -41,19 +41,6 @@ if { ! [ runto_main ] } then {
     return -1
 }
 
-proc capture_command_output { command prefix } {
-    global gdb_prompt
-    global expect_out
-
-    set output_string ""
-    gdb_test_multiple "$command" "capture_command_output for $command" {
-       -re "${command}\[\r\n\]+${prefix}(.*)\[\r\n\]+$gdb_prompt $" {
-           set output_string $expect_out(1,string)
-       }
-    }
-    return $output_string
-}
-
 gdb_test "break terminal_func" "Breakpoint .* at .*${srcfile}, line .*" \
        "set breakpoint at terminal_func"
 

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index c22162d10b7fe01a16e5d4ecfbf318f6253cbad5..30463a97fda4d7fe592131c44155155286965091 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -4773,5 +4773,19 @@ proc parse_args { argset } {
     # number of items expected to be passed into the procedure...
 }
 
+# Capture the output of COMMAND in a string ignoring PREFIX; return that string.
+proc capture_command_output { command prefix } {
+    global gdb_prompt
+    global expect_out
+
+    set output_string ""
+    gdb_test_multiple "$command" "capture_command_output for $command" {
+       -re "${command}\[\r\n\]+${prefix}(.*)\[\r\n\]+$gdb_prompt $" {
+           set output_string $expect_out(1,string)
+       }
+    }
+    return $output_string
+}
+
 # Always load compatibility stuff.
 load_lib future.exp