aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2018-06-22 20:56:08 +0000
committerTom de Vries <vries@gcc.gnu.org>2018-06-22 20:56:08 +0000
commit73607ff9ec812d546fcd89e136dac482d9684371 (patch)
tree02c50d4f107976fe43efa23d29ab973232931d54
parentbe56f2c4730a3d28389f7ff757fb3b7137bd2e57 (diff)
downloadgcc-73607ff9ec812d546fcd89e136dac482d9684371.zip
gcc-73607ff9ec812d546fcd89e136dac482d9684371.tar.gz
gcc-73607ff9ec812d546fcd89e136dac482d9684371.tar.bz2
[testsuite/guality] Use buildarea gdb by default in combined build
2018-06-22 Tom de Vries <tdevries@suse.de> * g++.dg/guality/guality.exp (guality_gdb_name): Default to $rootme/../gdb/gdb, if available. * gcc.dg/guality/guality.exp (guality_gdb_name): Same. * gfortran.dg/guality/guality.exp (guality_gdb_name): Same. From-SVN: r261935
-rw-r--r--gcc/testsuite/ChangeLog7
-rw-r--r--gcc/testsuite/g++.dg/guality/guality.exp3
-rw-r--r--gcc/testsuite/gcc.dg/guality/guality.exp3
-rw-r--r--gcc/testsuite/gfortran.dg/guality/guality.exp3
4 files changed, 16 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 320fdac..b99ba40 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,12 @@
2018-06-22 Tom de Vries <tdevries@suse.de>
+ * g++.dg/guality/guality.exp (guality_gdb_name): Default to
+ $rootme/../gdb/gdb, if available.
+ * gcc.dg/guality/guality.exp (guality_gdb_name): Same.
+ * gfortran.dg/guality/guality.exp (guality_gdb_name): Same.
+
+2018-06-22 Tom de Vries <tdevries@suse.de>
+
* lib/gcc-gdb-test.exp (report_gdb): New proc.
* g++.dg/guality/guality.exp: Use report_gdb.
* gcc.dg/guality/guality.exp: Same.
diff --git a/gcc/testsuite/g++.dg/guality/guality.exp b/gcc/testsuite/g++.dg/guality/guality.exp
index 72f23c8..e5eacee 100644
--- a/gcc/testsuite/g++.dg/guality/guality.exp
+++ b/gcc/testsuite/g++.dg/guality/guality.exp
@@ -38,6 +38,9 @@ global GDB
if ![info exists ::env(GUALITY_GDB_NAME)] {
if [info exists GDB] {
set guality_gdb_name "$GDB"
+ } elseif [file exists $rootme/../gdb/gdb] {
+ # If we're doing a combined build, and gdb is available, use it.
+ set guality_gdb_name "$rootme/../gdb/gdb"
} else {
set guality_gdb_name "[transform gdb]"
}
diff --git a/gcc/testsuite/gcc.dg/guality/guality.exp b/gcc/testsuite/gcc.dg/guality/guality.exp
index 7eebd27..2a90ec3 100644
--- a/gcc/testsuite/gcc.dg/guality/guality.exp
+++ b/gcc/testsuite/gcc.dg/guality/guality.exp
@@ -38,6 +38,9 @@ global GDB
if ![info exists ::env(GUALITY_GDB_NAME)] {
if [info exists GDB] {
set guality_gdb_name "$GDB"
+ } elseif [file exists $rootme/../gdb/gdb] {
+ # If we're doing a combined build, and gdb is available, use it.
+ set guality_gdb_name "$rootme/../gdb/gdb"
} else {
set guality_gdb_name "[transform gdb]"
}
diff --git a/gcc/testsuite/gfortran.dg/guality/guality.exp b/gcc/testsuite/gfortran.dg/guality/guality.exp
index 62875fd..3784cac 100644
--- a/gcc/testsuite/gfortran.dg/guality/guality.exp
+++ b/gcc/testsuite/gfortran.dg/guality/guality.exp
@@ -19,6 +19,9 @@ global GDB
if ![info exists ::env(GUALITY_GDB_NAME)] {
if [info exists GDB] {
set guality_gdb_name "$GDB"
+ } elseif [file exists $rootme/../gdb/gdb] {
+ # If we're doing a combined build, and gdb is available, use it.
+ set guality_gdb_name "$rootme/../gdb/gdb"
} else {
set guality_gdb_name "[transform gdb]"
}