From 986cf455bfb25d8696232695fbcc93649c10a523 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@ericsson.com>
Date: Wed, 6 Jul 2016 10:18:10 -0400
Subject: [PATCH] gdb.ada/arraydim.exp: Fix directory layout

I forgot to fix this one in the previous commit.

gdb/testsuite/ChangeLog:

	* gdb.ada/arraydim.exp: Remove extra directory level in build
	directory.
---
 gdb/testsuite/ChangeLog            | 5 +++++
 gdb/testsuite/gdb.ada/arraydim.exp | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 013af4d6af..b0e6c2a2ef 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-06  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* gdb.ada/arraydim.exp: Remove extra directory level in build
+	directory.
+
 2016-07-06  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* lib/ada.exp: Remove extra directory level in build directory.
diff --git a/gdb/testsuite/gdb.ada/arraydim.exp b/gdb/testsuite/gdb.ada/arraydim.exp
index 58b50ab1f4..38eafa529e 100644
--- a/gdb/testsuite/gdb.ada/arraydim.exp
+++ b/gdb/testsuite/gdb.ada/arraydim.exp
@@ -17,8 +17,8 @@ load_lib "ada.exp"
 
 standard_ada_testfile foo
 
-set cfile "${testdir}/inc"
-set csrcfile ${srcdir}/${subdir}/${cfile}.c
+set cfile "inc"
+set csrcfile ${srcdir}/${subdir}/${testdir}/${cfile}.c
 set cobject [standard_output_file ${cfile}.o]
 
 gdb_compile "${csrcfile}" "${cobject}" object [list debug]