[PATCH][testsuite/guality] Use buildarea gdb by default in combined build

[Tom de Vries]

Hi,

when doing a combined build of gcc and binutils-gdb repos, guality still
uses the gdb in PATH by default.

This patch makes sure that quality uses the gdb from the combined build
instead.

Tested on x86_64.

OK for trunk?

Thanks,
- Tom

[testsuite/guality] Use buildarea gdb by default in combined build

2018-06-22  Tom de Vries  <tdevr...@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.

---
 gcc/testsuite/g++.dg/guality/guality.exp      | 3 +++
 gcc/testsuite/gcc.dg/guality/guality.exp      | 3 +++
 gcc/testsuite/gfortran.dg/guality/guality.exp | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/gcc/testsuite/g++.dg/guality/guality.exp 
b/gcc/testsuite/g++.dg/guality/guality.exp
index 72f23c8cca7..e5eaceedc9a 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 7eebd27b544..2a90ec3c8c8 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 62875fd54b8..3784cac1ef3 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]"
     }