From patchwork Mon Jan 25 21:23:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 10559 Received: (qmail 110172 invoked by alias); 25 Jan 2016 21:24:04 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 108999 invoked by uid 89); 25 Jan 2016 21:24:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.8 required=5.0 tests=BAYES_50, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 spammy=UD:fun_addr.exp, fun_addrexp, fun_addr.exp, cds X-HELO: usplmg20.ericsson.net Received: from usplmg20.ericsson.net (HELO usplmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Mon, 25 Jan 2016 21:24:02 +0000 Received: from EUSAAHC001.ericsson.se (Unknown_Domain [147.117.188.75]) by usplmg20.ericsson.net (Symantec Mail Security) with SMTP id E4.E4.06940.3BF86A65; Mon, 25 Jan 2016 22:12:20 +0100 (CET) Received: from [142.133.110.144] (147.117.188.8) by smtp-am.internal.ericsson.com (147.117.188.77) with Microsoft SMTP Server id 14.3.248.2; Mon, 25 Jan 2016 16:23:59 -0500 Subject: Re: [PATCH] Always organize test artifacts in a directory hierarchy To: Joel Brobecker , Pedro Alves References: <1452268308-23845-1-git-send-email-simon.marchi@ericsson.com> <5694F8D2.5090807@redhat.com> <56952A6C.8070507@ericsson.com> <569630EC.2000702@redhat.com> <20160117063144.GB4059@adacore.com> CC: From: Simon Marchi Message-ID: <56A6926F.6040503@ericsson.com> Date: Mon, 25 Jan 2016 16:23:59 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <20160117063144.GB4059@adacore.com> X-IsSubscribed: yes On 16-01-17 01:31 AM, Joel Brobecker wrote: >>> So it doesn't seem necessary. >> >> Works for me. The patch LGTM. Maybe wait a few more days to >> give others a chance to chime in though. > > LGTM too; and, for the record, I am very happy about this change. > Hi Joel (and others), I was doing some more testing, and found out that this patch breaks testing Ada when building in-tree. I would merge the following patch just before the original one. How does it look? From d69875543609365fdf70f09b30862834b790599a Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 25 Jan 2016 14:01:25 -0500 Subject: [PATCH] Fix in-tree, parallel running of Ada tests While testing the following patch, [PATCH] Always organize test artifacts in a directory hierarchy https://sourceware.org/ml/gdb-patches/2016-01/msg00133.html I noticed that it broke Ada testing. This lead me to think that parallel testing when building in-tree didn't work previously in Ada. It is confirmed by this test: $ make check TESTS="gdb.ada/fun_addr.exp" -j 2 ... Running ./gdb.ada/fun_addr.exp ... FAIL: gdb.ada/fun_addr.exp: compilation foo.adb ... This patch fixes in-tree parallel testing for Ada, and consequently serial and parallel testing when the aforementioned patch is applied. The problem originates from the fact that Ada support code cd's to the builddir before compiling. In itself it's not a problem, it allows to place intermediate auto-generated files in that directory. The Ada compilation refers to the source file, which is in another directory, only by its base name (e.g. foo.adb). In serial mode, that worked because builddir was the same as the source directory (e.g. gdb.ada/fun_addr/). In an out-of-tree build, it works because the source directory is added as an include directory (note: this is not the same $srcdir as autoconf's): set srcdir [file dirname $source] additional_flags=-I$srcdir which becomes: additional_flags=-I/home/emaisin/build/binutils-gdb/gdb/testsuite/gdb.ada/fun_addr However, when building in-tree, srcdir is relative: ./gdb.ada/fun_addr. When using parallel or always-in-outputs-directory mode, we are cd'ed in the outputs directory. So -I$srcdir is relative to the current directory, which is wrong. To fix it, I made the TCL variable srcdir (set in site.exp, from which everything else is derived) always absolute. It is done by assigning autoconf's abs_srcdir instead of autoconf's srcdir. This way -I$srcdir will always be good, regardless of where we cd'ed to. A small apparent change is that when running tests, DejaGnu will say: Running /tmp/binutils-gdb/gdb/testsuite/gdb.ada/fun_addr.exp ... instead of Running ./gdb.ada/fun_addr.exp ... I hope it's not too much of an annoyance. I think that it should make the testsuite a tiny bit more robust against other bugs of the same class. Regtested in & out of tree, only with native target. --- gdb/testsuite/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index 7c251d3..38c3052 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -21,6 +21,7 @@ srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ target_alias = @target_noncanonical@ program_transform_name = @program_transform_name@ @@ -119,7 +120,7 @@ $(abs_builddir)/site.exp site.exp: ./config.status Makefile @echo "set target_alias $(target_alias)" >> ./tmp0 @echo "set target_triplet ${target_canonical}" >> ./tmp0 @echo "set build_triplet ${build_canonical}" >> ./tmp0 - @echo "set srcdir ${srcdir}" >> ./tmp0 + @echo "set srcdir ${abs_srcdir}" >> ./tmp0 @echo "set tool gdb" >> ./tmp0 @echo 'source $${srcdir}/lib/append_gdb_boards_dir.exp' >> ./tmp0 @echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0