From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Tue, 25 Feb 2014 19:47:09 +0000 (+0100)
Subject: PR gdb/16626
X-Git-Tag: gdb-7.7.1-release~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9789545976ff88efbab71c8edd1ea8f65462904;p=thirdparty%2Fbinutils-gdb.git

PR gdb/16626

gdb/testsuite/
2014-02-25  Jan Kratochvil  <jan.kratochvil@redhat.com>

	PR gdb/16626
	* gdb.base/auto-load.exp: Fix out-of-srctree run.

Message-ID: <87k3cjt3jl.fsf@fleche.redhat.com>
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c9b65b2c6f7..bc317d7c9dd 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -5,6 +5,9 @@
 	* gdb.base/auto-load.c: New file.
 	* gdb.base/auto-load.exp: New file.
 
+	PR gdb/16626
+	* gdb.base/auto-load.exp: Fix out-of-srctree run.
+
 2014-02-05  Yao Qi  <yao@codesourcery.com>
 
 	* gdb.trace/report.exp (use_collected_data): Test the output
diff --git a/gdb/testsuite/gdb.base/auto-load.exp b/gdb/testsuite/gdb.base/auto-load.exp
index 226711f5156..d0e93f064b2 100644
--- a/gdb/testsuite/gdb.base/auto-load.exp
+++ b/gdb/testsuite/gdb.base/auto-load.exp
@@ -20,8 +20,8 @@ if [is_remote host] {
 }
 
 set targetdir "${binfile}.dir"
-set sourcescript "${binfile}-script"
-set targetscriptdir "${targetdir}/[file dirname ${sourcescript}]"
+set sourcescript "${srcdir}/${subdir}/${testfile}-script"
+set targetscriptdir "${targetdir}/[file dirname ${binfile}]"
 set targetscript "${targetscriptdir}/${testfile}-gdb.gdb"
 
 remote_exec host "rm -rf ${targetdir}"