[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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 320fdac341b0906dbc1e96de726ac1baa0a18507..b99ba40ab90935c3be02899bb11bd6e90bd43fa1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+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.

diff --git a/gcc/testsuite/g++.dg/guality/guality.exp b/gcc/testsuite/g++.dg/guality/guality.exp
index 72f23c8cca727c011b2122875253b4cac5406391..e5eaceedc9ab529eace3209973a6220fec8f49a2 100644 (file)
--- 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 7eebd27b544cab2c025fb742008dde0356e37154..2a90ec3c8c8e3a3a49241f69f49726ec8729e7d1 100644 (file)
--- 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 62875fd54b8ab4e21c6b2fcb2862d867e632dd5d..3784cac1ef32e16148819450f84632507731ede3 100644 (file)
--- 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]"
     }