From patchwork Wed Dec 4 20:37:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 36520 Received: (qmail 83563 invoked by alias); 4 Dec 2019 20:37:12 -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 83543 invoked by uid 89); 4 Dec 2019 20:37:12 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=sk:univers, gdbexp, UD:gdb.exp, gdb.exp X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 04 Dec 2019 20:37:10 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 0C9132053E; Wed, 4 Dec 2019 15:37:08 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id 92F51201E0; Wed, 4 Dec 2019 15:37:07 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 4C40B2816F; Wed, 4 Dec 2019 15:37:07 -0500 (EST) X-Gerrit-PatchSet: 2 Date: Wed, 4 Dec 2019 15:37:06 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: Andrew Burgess , Tom Tromey , gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [pushed] gdb/testsuite: Use -J option when compiling Fortran tests X-Gerrit-Change-Id: I99444cf22d80e320093d3f3ed9abb8825f378e0b X-Gerrit-Change-Number: 733 X-Gerrit-ChangeURL: X-Gerrit-Commit: 8d70a9f0938b9e9efc4fd2eee80cf806b5e97a4a In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, tromey@sourceware.org, andrew.burgess@embecosm.com, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191204203707.4C40B2816F@gnutoolchain-gerrit.osci.io> The original change was created by Andrew Burgess. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/733 ...................................................................... gdb/testsuite: Use -J option when compiling Fortran tests When compiling Fortran tests (e.g. gdb.fortran/info-modules.exp), the Fotran compile produces .mod files. These files contain details of compiled modules that are then consumed by the compiler when compiling other files that USE a module. Currently the compiler writes the .mod files into its current directory, so for us this turns out to be 'build/gdb/testsuite/'. This means that .mod files can be shared between tests, which seems against the spirit of the GDB testsuite; source files should be compiled fresh for each test. This commit adds the -J option to the compiler flags whenever we compile a Fortran file, this option tells the compiler where to write, and look for, .mod files. After this commit there was one Fortran test that needed fixing, with that fix in place all of the Fortran tests pass again, but now the .mod files are now produced in the per-test output directories. gdb/testsuite/ChangeLog: * lib/gdb.exp (gdb_compile): Add -J compiler option when building Fortran tests. * gdb.mi/mi-fortran-modules.exp: Compile source files in correct order. Change-Id: I99444cf22d80e320093d3f3ed9abb8825f378e0b --- M gdb/testsuite/ChangeLog M gdb/testsuite/gdb.mi/mi-fortran-modules.exp M gdb/testsuite/lib/gdb.exp 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8df282c..173e82d 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2019-12-04 Andrew Burgess + * lib/gdb.exp (gdb_compile): Add -J compiler option when building + Fortran tests. + * gdb.mi/mi-fortran-modules.exp: Compile source files in correct + order. + +2019-12-04 Andrew Burgess + * gdb.fortran/type-kinds.exp (test_cast_1_to_type_kind): Handle casting to type with no kind specified. (test_basic_parsing_of_type_kinds): Additional tests for types diff --git a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp index 12a81a6..df48324 100644 --- a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp +++ b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp @@ -22,7 +22,7 @@ standard_testfile "mi-fortran-modules.f90" "mi-fortran-modules-2.f90" if {[prepare_for_testing "failed to prepare" ${testfile} \ - [list $srcfile $srcfile2] {debug f90}]} { + [list $srcfile2 $srcfile] {debug f90}]} { return -1 } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 4682f5d..aa77446 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3719,6 +3719,16 @@ } else { set new_options [universal_compile_options] } + + # Place (and look for) Fortran `.mod` files in the output + # directory for this specific test. + if {[lsearch -exact $options f77] != -1 \ + || [lsearch -exact $options f90] != -1 } { + # Fortran compile. + set mod_path [standard_output_file ""] + lappend new_options "additional_flags=-J${mod_path}" + } + set shlib_found 0 set shlib_load 0 set getting_compiler_info 0