From patchwork Wed Sep 21 12:02:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 15838 Received: (qmail 30381 invoked by alias); 21 Sep 2016 12:02:52 -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 30311 invoked by uid 89); 21 Sep 2016 12:02:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=20160629, 2016-06-29, subdir, organize X-HELO: mailapp01.imgtec.com Received: from mailapp01.imgtec.com (HELO mailapp01.imgtec.com) (195.59.15.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 21 Sep 2016 12:02:49 +0000 Received: from HHMAIL01.hh.imgtec.org (unknown [10.100.10.19]) by Forcepoint Email with ESMTPS id 8D13494B94B35 for ; Wed, 21 Sep 2016 13:02:33 +0100 (IST) Received: from [10.20.78.224] (10.20.78.224) by HHMAIL01.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server id 14.3.294.0; Wed, 21 Sep 2016 13:02:35 +0100 Date: Wed, 21 Sep 2016 13:02:28 +0100 From: "Maciej W. Rozycki" To: Subject: [committed] MIPS/testsuite: mips16-thunks: Use `standard_output_file' Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Correct a commit 2151ccc56c74 ("Always organize test artifacts in a directory hierarchy") regression causing: Running .../gdb/testsuite/gdb.arch/mips16-thunks.exp ... gdb compile failed, Assembler messages: Fatal error: can't create .../gdb/testsuite/gdb.arch/mips16-thunks-inmain.o: No such file or directory gdb compile failed, Assembler messages: Fatal error: can't create .../gdb/testsuite/gdb.arch/mips16-thunks-main.o: No such file or directory gdb compile failed, mips-mti-linux-gnu-gcc: error: .../gdb/testsuite/gdb.arch/mips16-thunks-inmain.o: No such file or directory mips-mti-linux-gnu-gcc: error: .../gdb/testsuite/gdb.arch/mips16-thunks-main.o: No such file or directory UNSUPPORTED: gdb.arch/mips16-thunks.exp: No MIPS16 support in the toolchain. by using `standard_output_file' to construct output file names throughout. gdb/testsuite/ * gdb.arch/mips16-thunks.exp: Use `standard_output_file' throughout. --- gdb-mips-test-mips16-thunks-objfile.diff Index: binutils/gdb/testsuite/gdb.arch/mips16-thunks.exp =================================================================== --- binutils.orig/gdb/testsuite/gdb.arch/mips16-thunks.exp 2016-06-29 12:28:22.000000000 +0100 +++ binutils/gdb/testsuite/gdb.arch/mips16-thunks.exp 2016-09-20 22:58:12.832115031 +0100 @@ -35,14 +35,13 @@ proc set_src_and_obj { filename { suffix upvar srcfile srcfile upvar objfile objfile global srcdir - global objdir global subdir if ![string equal "$suffix" ""] then { set suffix "-$suffix" } set srcfile ${srcdir}/${subdir}/${filename}.c - set objfile ${objdir}/${subdir}/${filename}${suffix}.o + set objfile [standard_output_file ${filename}${suffix}.o] } # First check if a trivial MIPS16 program can be built and debugged. This @@ -60,7 +59,7 @@ set options [list debug nowarnings addit lappend objfiles ${objfile} gdb_compile ${srcfile} ${objfile} object ${options} -set binfile ${objdir}/${subdir}/${testname} +set binfile [standard_output_file ${testname}] set options [list debug nowarnings] if { [gdb_compile ${objfiles} ${binfile} executable ${options}] != "" } then { unsupported "No MIPS16 support in the toolchain." @@ -115,7 +114,7 @@ set options [list \ lappend objfiles ${objfile} gdb_compile ${srcfile} ${objfile} object ${options} -set binfile ${objdir}/${subdir}/${testname} +set binfile [standard_output_file ${testname}] set options [list debug nowarnings additional_flags=-fPIC] if { [gdb_compile ${objfiles} ${binfile} executable ${options}] == "" } then { clean_restart ${testname} @@ -186,7 +185,7 @@ set options [list \ lappend objfiles ${objfile} gdb_compile ${srcfile} ${objfile} object ${options} -set binfile ${objdir}/${subdir}/${testname} +set binfile [standard_output_file ${testname}] set options [list debug nowarnings] gdb_compile ${objfiles} ${binfile} executable ${options} clean_restart ${testname}