[gdb/testsuite] Handle unbuffer_output.c for remote host

Handle $srcdir/lib/unbuffer_output.c using lappend_include_file.

Tested on x86_64-linux.

diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp
index 08f6599c84a4faeb952a3f81babb1364179c7471..ae0b9c2dd6e6c3263a7b98c9e6f74b297b97ad23 100644 (file)
--- a/gdb/testsuite/gdb.base/a2-run.exp
+++ b/gdb/testsuite/gdb.base/a2-run.exp
@@ -24,7 +24,11 @@ require {!gdb_skip_stdio_test "a2run.exp"}
 
 standard_testfile run.c
 
-if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
+set flags {}
+lappend flags debug
+lappend_include_file flags $srcdir/lib/unbuffer_output.c
+
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile $flags] } {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/call-ar-st.c b/gdb/testsuite/gdb.base/call-ar-st.c
index 497af840854392e032081c5a6f7a239a29c39ec7..6c1e3b95fa120925246b656992e9e9d998515e1a 100644 (file)
--- a/gdb/testsuite/gdb.base/call-ar-st.c
+++ b/gdb/testsuite/gdb.base/call-ar-st.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../lib/unbuffer_output.c"
+#include "unbuffer_output.c"
 
 /**************************************************************************
  * TESTS :

diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp
index 8abd3b40d91ccb2d89c9457701526b9e9026dc6a..0118ad7ffe8f9f513daf92c88a7d5e4ee1ba221a 100644 (file)
--- a/gdb/testsuite/gdb.base/call-ar-st.exp
+++ b/gdb/testsuite/gdb.base/call-ar-st.exp
@@ -28,7 +28,11 @@ require {!target_info exists gdb,cannot_call_functions}
 
 set allow_float_test [allow_float_test]
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
+set flags {}
+lappend flags debug
+lappend_include_file flags $srcdir/lib/unbuffer_output.c
+
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/call-rt-st.c b/gdb/testsuite/gdb.base/call-rt-st.c
index 072ea8601927f29975ec953478e5cdfe214eda45..e4bc297bb79ff07787dc9670daafed93008a13dd 100644 (file)
--- a/gdb/testsuite/gdb.base/call-rt-st.c
+++ b/gdb/testsuite/gdb.base/call-rt-st.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../lib/unbuffer_output.c"
+#include "unbuffer_output.c"
 
 /**************************************************************************
  * TESTS :

diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base/call-rt-st.exp
index 9840e3cd8ed0486d7ab4936131516c4b71f34c24..63db4c56d574f000d8aa11cd765340fd8c223b6c 100644 (file)
--- a/gdb/testsuite/gdb.base/call-rt-st.exp
+++ b/gdb/testsuite/gdb.base/call-rt-st.exp
@@ -25,7 +25,12 @@ require {!target_info exists gdb,cannot_call_functions}
 
 standard_testfile .c
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
+set flags {}
+lappend flags debug
+lappend flags nowarnings
+lappend_include_file flags $srcdir/lib/unbuffer_output.c
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $flags] != "" } {
     untested "failed to compile"
     return -1
 }

diff --git a/gdb/testsuite/gdb.base/call-strs.c b/gdb/testsuite/gdb.base/call-strs.c
index 03a80647d7eaa130c8d4a6c2e19e38954b7c3db9..c734936ecbc2f75fd89a3a10a0a76d29bb4ebbda 100644 (file)
--- a/gdb/testsuite/gdb.base/call-strs.c
+++ b/gdb/testsuite/gdb.base/call-strs.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../lib/unbuffer_output.c"
+#include "unbuffer_output.c"
 
 char buf[100];
 char bigbuf[1000];

diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp
index f1577cb44df635a3b876b5f75e80892ed3a2d8c4..781b2453cd0ccc0bb6b5f756294e6a1a1182eed7 100644 (file)
--- a/gdb/testsuite/gdb.base/call-strs.exp
+++ b/gdb/testsuite/gdb.base/call-strs.exp
@@ -29,8 +29,11 @@ standard_testfile
 # test.
 require {!target_info exists gdb,cannot_call_functions}
 
+set flags {}
+lappend flags debug
+lappend_include_file flags $srcdir/lib/unbuffer_output.c
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.c b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.c
index ca48393f43af0b7b70443c8c5bbc31c650ce20f9..f923ad2627b372615bf24ef2d3e2d9bd5754f209 100644 (file)
--- a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.c
+++ b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.c
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include <stdio.h>
 
-#include "../lib/unbuffer_output.c"
+#include "unbuffer_output.c"
 
 int
 main (void)

diff --git a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp
index 9908c1af5399be45bdc22b6ff09832aa93388962..5770437d3a1c68f366832dada6833437fbc88f53 100644 (file)
--- a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp
+++ b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp
@@ -28,7 +28,11 @@ require {!target_info exists gdb,cannot_call_functions}
 set dp_location [gdb_get_line_number "set dprintf here"]
 set bp_location [gdb_get_line_number "set breakpoint here"]
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
+set flags {}
+lappend flags debug
+lappend_include_file flags $srcdir/lib/unbuffer_output.c
+
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile $flags]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index 316897f9c5c2de95c0347da7c84c08d44dd7f386..ec2015ebef5a6b988d18786d3aa557df42d05309 100644 (file)
--- a/gdb/testsuite/gdb.base/commands.exp
+++ b/gdb/testsuite/gdb.base/commands.exp
@@ -25,9 +25,14 @@
 
 set allow_hw_watchpoint_tests_p [allow_hw_watchpoint_tests]
 
-standard_testfile
+standard_testfile run.c
 
-if { [prepare_for_testing "failed to prepare" commands run.c {debug additional_flags=-DFAKEARGV}] } {
+set flags {}
+lappend flags debug
+lappend flags additional_flags=-DFAKEARGV
+lappend_include_file flags $srcdir/lib/unbuffer_output.c
+
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile $flags] } {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/dprintf.c b/gdb/testsuite/gdb.base/dprintf.c
index ee2dc6031b544c42f11f14f1c8d2764e3a299137..700a77b4fe0b964f02ea01dbe41ff5282ef00dca 100644 (file)
--- a/gdb/testsuite/gdb.base/dprintf.c
+++ b/gdb/testsuite/gdb.base/dprintf.c
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 
-#include "../lib/unbuffer_output.c"
+#include "unbuffer_output.c"
 
 static int g;
 

diff --git a/gdb/testsuite/gdb.base/dprintf.exp b/gdb/testsuite/gdb.base/dprintf.exp
index 2d838e7f7b96ce5c19585c48bafdd2f363024909..d17b81e1833a3268e9079483a855140407336297 100644 (file)
--- a/gdb/testsuite/gdb.base/dprintf.exp
+++ b/gdb/testsuite/gdb.base/dprintf.exp
@@ -15,7 +15,11 @@
 
 standard_testfile
 
-if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
+set flags {}
+lappend flags debug
+lappend_include_file flags $srcdir/lib/unbuffer_output.c
+
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile $flags] } {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/ending-run.c b/gdb/testsuite/gdb.base/ending-run.c
index 1e09f1648775931bce225ac5b87d64f948f9ecb9..a499f37a052593186f15d63023f530f92b05bcea 100644 (file)
--- a/gdb/testsuite/gdb.base/ending-run.c
+++ b/gdb/testsuite/gdb.base/ending-run.c
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../lib/unbuffer_output.c"
+#include "unbuffer_output.c"
 
 int callee (int x)
 {

diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index b2cfc03e3bf76e8892e439f56b684fba9ec51769..070dcc6f190a26973fa367fec553bb096a1a30b3 100644 (file)
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -23,7 +23,11 @@
 
 standard_testfile
 
-if { [prepare_for_testing "failed to prepare" $testfile] } {
+set flags {}
+lappend flags debug
+lappend_include_file flags $srcdir/lib/unbuffer_output.c
+
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile $flags] } {
     return -1
 }
 remote_exec build "rm -f core"

diff --git a/gdb/testsuite/gdb.base/interrupt.c b/gdb/testsuite/gdb.base/interrupt.c
index 6426015afa8504081f2fb8a8fb436e08cc201582..ab6bac9f8218807aec7e85cd799016ce270dd83e 100644 (file)
--- a/gdb/testsuite/gdb.base/interrupt.c
+++ b/gdb/testsuite/gdb.base/interrupt.c
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "../lib/unbuffer_output.c"
+#include "unbuffer_output.c"
 
 #ifdef SIGNALS
 #include <signal.h>

diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp
index 19628e2f4198ce4e795f77fd72db7d06115419cc..87edf5d7f89d5e59faf9b14df6b5185fc66f61a2 100644 (file)
--- a/gdb/testsuite/gdb.base/interrupt.exp
+++ b/gdb/testsuite/gdb.base/interrupt.exp
@@ -19,7 +19,10 @@ require {!target_info exists gdb,noinferiorio}
 
 standard_testfile
 
-set options { debug }
+set options {}
+lappend options debug
+lappend_include_file options $srcdir/lib/unbuffer_output.c
+
 if { ! [target_info exists gdb,nosignals] } {
     lappend options "additional_flags=-DSIGNALS"
 }

diff --git a/gdb/testsuite/gdb.base/multi-forks.c b/gdb/testsuite/gdb.base/multi-forks.c
index aedd13493df832a34e68060c069630b0834ae2ac..91b7db12abb322daa47c5a13d5976d323b665354 100644 (file)
--- a/gdb/testsuite/gdb.base/multi-forks.c
+++ b/gdb/testsuite/gdb.base/multi-forks.c
@@ -20,7 +20,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../lib/unbuffer_output.c"
+#include "unbuffer_output.c"
 
 pid_t pids[4];
 

diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp
index 02dd327cad753ea45a0b03edfa9f6d88bacf0678..54ce9264d4b75a835844e637aa80d323253e481e 100644 (file)
--- a/gdb/testsuite/gdb.base/multi-forks.exp
+++ b/gdb/testsuite/gdb.base/multi-forks.exp
@@ -21,7 +21,11 @@ require {istarget "*-*-linux*"}
 
 standard_testfile .c
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+set flags {}
+lappend flags debug
+lappend_include_file flags $srcdir/lib/unbuffer_output.c
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $flags] != "" } {
      untested "failed to compile"
      return -1
 }

diff --git a/gdb/testsuite/gdb.base/run.c b/gdb/testsuite/gdb.base/run.c
index 614b018260d7a213f016ec72acded19c0343bac1..d0e631a84577efc3f300fa63f2850ada2b0d356a 100644 (file)
--- a/gdb/testsuite/gdb.base/run.c
+++ b/gdb/testsuite/gdb.base/run.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../lib/unbuffer_output.c"
+#include "unbuffer_output.c"
 
 int factorial (int);
 

diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp
index 88c43534b01815100afe15b2371dc11e51a2815e..2ec81d50ec7bd833457149c091900773eb959888 100644 (file)
--- a/gdb/testsuite/gdb.base/shlib-call.exp
+++ b/gdb/testsuite/gdb.base/shlib-call.exp
@@ -43,7 +43,12 @@ set lib1     [standard_output_file shr1.sl]
 set lib2     [standard_output_file shr2.sl]
 
 set lib_opts "debug"
-set exec_opts [list debug shlib=${lib1} shlib=${lib2}]
+
+set exec_opts {}
+lappend exec_opts debug
+lappend exec_opts shlib=$lib1
+lappend exec_opts shlib=$lib2
+lappend_include_file exec_opts $srcdir/lib/unbuffer_output.c
 
 if { [gdb_compile_shlib ${lib1src} ${lib1} $lib_opts] != ""
      || [gdb_compile_shlib ${lib2src} ${lib2} $lib_opts] != ""

diff --git a/gdb/testsuite/gdb.base/shmain.c b/gdb/testsuite/gdb.base/shmain.c
index 932b83477e2a948853ebd23523be2af6d553fab3..853352e8c4524bd1f81c270f2d0091c1787434ec 100644 (file)
--- a/gdb/testsuite/gdb.base/shmain.c
+++ b/gdb/testsuite/gdb.base/shmain.c
@@ -3,7 +3,7 @@
 #include "ss.h"
 #include <stdio.h>
 
-#include "../lib/unbuffer_output.c"
+#include "unbuffer_output.c"
 
 extern int structarg(struct s);
 extern int pstructarg(struct s*);

diff --git a/gdb/testsuite/gdb.base/varargs.c b/gdb/testsuite/gdb.base/varargs.c
index fcadcee6fb39f15b88e3ec491f71c588a080db45..e0083c7d8bd751e76d05c084504f72191754d35b 100644 (file)
--- a/gdb/testsuite/gdb.base/varargs.c
+++ b/gdb/testsuite/gdb.base/varargs.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "../lib/unbuffer_output.c"
+#include "unbuffer_output.c"
 
 int find_max1(int, ...);
 int find_max2(int, int, ...);

diff --git a/gdb/testsuite/gdb.base/varargs.exp b/gdb/testsuite/gdb.base/varargs.exp
index f205a715f39dba854b7b8ed00e00e6b6d11c8d27..78c5610320513df1466ec746103f72e11a121ec0 100644 (file)
--- a/gdb/testsuite/gdb.base/varargs.exp
+++ b/gdb/testsuite/gdb.base/varargs.exp
@@ -33,14 +33,16 @@ standard_testfile .c
 
 set allow_float_test [allow_float_test]
 
-set additional_flags {debug}
+set flags {}
+lappend flags debug
+lappend_include_file flags $srcdir/lib/unbuffer_output.c
 if [support_complex_tests] {
-    lappend additional_flags "additional_flags=-DTEST_COMPLEX"
+    lappend flags "additional_flags=-DTEST_COMPLEX"
 }
 
 # build the first test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
-          executable ${additional_flags}] != "" } {
+          executable $flags] != "" } {
      untested "failed to compile"
      return -1
 }

diff --git a/gdb/testsuite/gdb.mi/mi-dprintf.c b/gdb/testsuite/gdb.mi/mi-dprintf.c
index cb851bc83c3950b256b2766faf93654eb7d594ba..bcfe2b4819b1d9a6bf177b3c464f3535f8c013be 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-dprintf.c
+++ b/gdb/testsuite/gdb.mi/mi-dprintf.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../lib/unbuffer_output.c"
+#include "unbuffer_output.c"
 
 static int g;
 

diff --git a/gdb/testsuite/gdb.mi/mi-dprintf.exp b/gdb/testsuite/gdb.mi/mi-dprintf.exp
index f2b8a57209736d6421a286c23822ec1f57e045d4..e40fa6121fa059fcc31f0cda593a95aa9868e4d8 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-dprintf.exp
+++ b/gdb/testsuite/gdb.mi/mi-dprintf.exp
@@ -19,7 +19,11 @@ set MIFLAGS "-i=mi"
 
 standard_testfile
 
-if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} {
+set flags {}
+lappend flags debug
+lappend_include_file flags $srcdir/lib/unbuffer_output.c
+
+if {[build_executable $testfile.exp $testfile $srcfile $flags] == -1} {
     untested "failed to compile"
     return -1
 }