[commit#2+7.7] [commit+7.7] [patch+7.7] Fix auto-load 7.7 regression (PR gdb/16626)

[Jan Kratochvil <jan.kratochvil@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

On Tue, 25 Feb 2014 20:06:54 +0100, Tom Tromey wrote:
> This new test fails for me on x86-64 Fedora 18.
> I'm building outside the source tree in case that matters.
> 
>     FAIL: gdb.base/auto-load.exp: print $script_loaded

You are right, I did not test it out-of-srctree.

Checked in master and in 7.7.


Thanks,
Jan

[-- Attachment #2: Type: message/rfc822, Size: 1517 bytes --]

From: Jan Kratochvil <jan.kratochvil@redhat.com>
Subject: [PATCH] PR gdb/16626
Date: Tue, 25 Feb 2014 20:47:09 +0100

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>
---
 gdb/testsuite/ChangeLog              | 3 +++
 gdb/testsuite/gdb.base/auto-load.exp | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1a2b358..d54ed98 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-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Fix dw2-icycle.exp -fsanitize=address GDB crash.
diff --git a/gdb/testsuite/gdb.base/auto-load.exp b/gdb/testsuite/gdb.base/auto-load.exp
index 226711f..d0e93f0 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}"
-- 
1.8.5.3