From: Tom de Vries <tdevries@suse.de>
Date: Fri, 22 Jun 2018 20:56:08 +0000 (+0000)
Subject: [testsuite/guality] Use buildarea gdb by default in combined build
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=73607ff9ec812d546fcd89e136dac482d9684371;p=gcc.git

[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 320fdac341b..b99ba40ab90 100644
--- 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 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]"
     }