[gdb/testsuite] Fix gdb.cp/*.exp for remote host

Fix a few test-cases in gdb.cp/*.exp for remote host using new proc
include_file.

Tested on x86_64-linux.

diff --git a/gdb/testsuite/gdb.cp/breakpoint-locs.exp b/gdb/testsuite/gdb.cp/breakpoint-locs.exp
index 0d1ad68f9f593d681e35c79899f929dbc146236f..11192654a351f18e8ac17803c3df93c37e8ce41f 100644 (file)
--- a/gdb/testsuite/gdb.cp/breakpoint-locs.exp
+++ b/gdb/testsuite/gdb.cp/breakpoint-locs.exp
@@ -19,6 +19,8 @@ require allow_cplus_tests
 
 standard_testfile .cc breakpoint-locs-2.cc
 
+include_file breakpoint-locs.h
+
 if { [prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2"\
          {debug c++}] } {
     return -1

diff --git a/gdb/testsuite/gdb.cp/filename.exp b/gdb/testsuite/gdb.cp/filename.exp
index 9b1d2b8a606f26fe535be2bb362c824224730149..2eddb9b7982cc04a49d64e55c06b19698dc72f78 100644 (file)
--- a/gdb/testsuite/gdb.cp/filename.exp
+++ b/gdb/testsuite/gdb.cp/filename.exp
@@ -17,6 +17,8 @@ require allow_cplus_tests
 
 standard_testfile .cc
 
+include_file includefile
+
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
     return -1
 }

diff --git a/gdb/testsuite/gdb.cp/gdb2384.exp b/gdb/testsuite/gdb.cp/gdb2384.exp
index 46d93d27e7ba431882bb548529259723ff225b0e..7c6b27fd8dbf6b1b0b7b9f3a848ba34fdf71fc62 100644 (file)
--- a/gdb/testsuite/gdb.cp/gdb2384.exp
+++ b/gdb/testsuite/gdb.cp/gdb2384.exp
@@ -25,6 +25,8 @@ require allow_cplus_tests allow_shlib_tests
 
 standard_testfile .cc gdb2384-base.cc
 
+include_file gdb2384-base.h
+
 set sofile [standard_output_file gdb2384-base.so]
 
 if { [gdb_compile_shlib $srcdir/$subdir/$srcfile2 $sofile {debug c++}] != ""

diff --git a/gdb/testsuite/gdb.cp/hang.exp b/gdb/testsuite/gdb.cp/hang.exp
index 7d8588520ec376c6665efe1a89c15b451f3dd621..71ab5c7a63b5160b827d57a0d24b0ea5528b4ac1 100644 (file)
--- a/gdb/testsuite/gdb.cp/hang.exp
+++ b/gdb/testsuite/gdb.cp/hang.exp
@@ -18,6 +18,8 @@ require allow_cplus_tests
 
 standard_testfile hang1.cc hang2.cc hang3.cc
 
+include_file hang.H
+
 if {[prepare_for_testing "failed to prepare" $testfile \
         [list $srcfile $srcfile2 $srcfile3] {debug c++}]} {
     return -1

diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp
index 56c4cdad95ea569b18f74e56725eb99e624f3d2c..419d772e28e34a48d94eb7ffc8ca9708ede81eb7 100644 (file)
--- a/gdb/testsuite/gdb.cp/m-static.exp
+++ b/gdb/testsuite/gdb.cp/m-static.exp
@@ -27,6 +27,8 @@ require allow_cplus_tests
 
 standard_testfile .cc m-static1.cc
 
+include_file m-static.h
+
 set flags [list debug c++]
 if { [test_compiler_info gcc-*] && [gcc_major_version] >= 10 } {
     # Work around PR gcc/101452.
@@ -181,7 +183,11 @@ gdb_test "print test4.somewhere" "\\$\[0-9\].* = 3.14\[0-9\]*" "static const flo
 
 # Also make sure static const members can be found via "info var".
 if { $non_dwarf } { setup_xfail *-*-* }
-gdb_test "info variable everywhere" "File .*/m-static\[.\]h.*const int gnu_obj_4::everywhere;"
+gdb_test "info variable everywhere" \
+    [multi_line \
+        "File (.*/)?m-static\[.\]h:" \
+        "$decimal:\tconst int gnu_obj_4::everywhere;" \
+        ".*"]
 
 # Perhaps at some point test4 should also include a test for a static
 # const int that was initialized in the header file.  But I'm not sure

diff --git a/gdb/testsuite/gdb.cp/mb-inline.exp b/gdb/testsuite/gdb.cp/mb-inline.exp
index 555827806f7b6524f7d6a9bbb352f36272ecbbad..9793b14c073fafe5839df4dd132d922ba3d3d69f 100644 (file)
--- a/gdb/testsuite/gdb.cp/mb-inline.exp
+++ b/gdb/testsuite/gdb.cp/mb-inline.exp
@@ -22,6 +22,7 @@ require allow_cplus_tests
 
 standard_testfile mb-inline1.cc mb-inline2.cc
 set hdrfile "${testfile}.h"
+include_file $hdrfile
 
 if {[prepare_for_testing "failed to prepare" $testfile \
         [list $srcfile $srcfile2] {debug c++}]} {

diff --git a/gdb/testsuite/gdb.cp/minsym-fallback.exp b/gdb/testsuite/gdb.cp/minsym-fallback.exp
index 56a56a3da6b775792ae054cbd6908736740fa997..a3bfe56bec6d594ea972f22b65636d62e4310237 100644 (file)
--- a/gdb/testsuite/gdb.cp/minsym-fallback.exp
+++ b/gdb/testsuite/gdb.cp/minsym-fallback.exp
@@ -18,6 +18,9 @@
 # a different file providing only ELF symbols.
 
 standard_testfile .cc minsym-fallback-main.cc
+
+include_file minsym-fallback.h
+
 set executable $testfile
 set objfile [standard_output_file ${testfile}.o]
 set objmainfile [standard_output_file ${testfile}-main.o]

diff --git a/gdb/testsuite/gdb.cp/ovsrch.exp b/gdb/testsuite/gdb.cp/ovsrch.exp
index 31a8abf77932317ad9b568e6db49763652b427e7..39e022c6676ffe4437ebfe972ecbb2e64654d2ae 100644 (file)
--- a/gdb/testsuite/gdb.cp/ovsrch.exp
+++ b/gdb/testsuite/gdb.cp/ovsrch.exp
@@ -57,6 +57,8 @@ require allow_cplus_tests
 # Test for c++/11734
 standard_testfile ovsrch1.cc ovsrch2.cc ovsrch3.cc ovsrch4.cc
 
+include_file ovsrch.h
+
 if {[prepare_for_testing "failed to prepare" $testfile \
         [list $srcfile $srcfile2 $srcfile3 $srcfile4] {c++ debug}]} {
     return -1

diff --git a/gdb/testsuite/gdb.cp/pr10728.exp b/gdb/testsuite/gdb.cp/pr10728.exp
index b860fb7c3aea8169fcf4170637d1dd48a36a8c36..ea9c1242725cddd822b044dfd6ff53f4120c11c5 100644 (file)
--- a/gdb/testsuite/gdb.cp/pr10728.exp
+++ b/gdb/testsuite/gdb.cp/pr10728.exp
@@ -22,6 +22,8 @@ require allow_cplus_tests
 load_lib "cp-support.exp"
 
 standard_testfile pr10728-x.cc pr10728-y.cc
+include_file pr10728-x.h
+
 set tfx [standard_output_file pr10728-x.o]
 set tfy [standard_output_file pr10728-y.o]
 

diff --git a/gdb/testsuite/gdb.cp/rtti.exp b/gdb/testsuite/gdb.cp/rtti.exp
index 8ad7683ee402a024ffe947284543f366ab3bf983..18dfaf0c2bda8f142be40783c5fa5ca52c6933a7 100644 (file)
--- a/gdb/testsuite/gdb.cp/rtti.exp
+++ b/gdb/testsuite/gdb.cp/rtti.exp
@@ -34,6 +34,8 @@ require allow_cplus_tests
 
 standard_testfile rtti1.cc rtti2.cc
 
+include_file rtti.h
+
 if {[prepare_for_testing "failed to prepare" $testfile \
         [list $srcfile $srcfile2] {debug c++}]} {
     return -1

diff --git a/gdb/testsuite/gdb.cp/stub-array-size.exp b/gdb/testsuite/gdb.cp/stub-array-size.exp
index 0afe232d583f449b1ba5b87e9193c6e69699dc12..7757db20af9cb76b843fb46a7ecdb10796eb5a41 100644 (file)
--- a/gdb/testsuite/gdb.cp/stub-array-size.exp
+++ b/gdb/testsuite/gdb.cp/stub-array-size.exp
@@ -22,6 +22,8 @@ require allow_cplus_tests
 
 standard_testfile .cc stub-array-size2.cc
 
+include_file stub-array-size.h
+
 if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" \
        {c++ debug}]} {
     return -1

diff --git a/gdb/testsuite/gdb.cp/subtypes.exp b/gdb/testsuite/gdb.cp/subtypes.exp
index f5cf349cc2608da6a4b752ef3149b5189b273852..afad478cba3b7bee20dc67dfdc15c5eb01a5fba7 100644 (file)
--- a/gdb/testsuite/gdb.cp/subtypes.exp
+++ b/gdb/testsuite/gdb.cp/subtypes.exp
@@ -22,6 +22,8 @@ load_lib "cp-support.exp"
 
 standard_testfile .cc subtypes-2.cc
 
+include_file subtypes.h
+
 if {[prepare_for_testing "failed to prepare" $testfile \
         [list $srcfile $srcfile2] \
         {debug c++ additional_flags=-std=c++11}]} {

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 6c2d7e1c74e54f44ff5190b3479b9f7e8f86fa71..dd392477b9a4413d73506ab76a895254f89bfd73 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -9554,6 +9554,18 @@ gdb_caching_proc have_compile_flag { flag } {
                additional_flags=$flag]
 }
 
+# Handle include file $srcdir/$subdir/FILE.
+
+proc include_file { file } {
+    set file [file join $::srcdir $::subdir $file]
+    if { [is_remote host] } {
+       set res [remote_download host $file]
+    } else {
+       set res $file
+    }
+
+    return $res
+}
 
 # Handle include file FILE, and if necessary update compiler flags variable
 # FLAGS.