From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27698 invoked by alias); 23 Jul 2007 11:43:29 -0000 Received: (qmail 27688 invoked by uid 22791); 23 Jul 2007 11:43:28 -0000 X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (65.74.133.4) by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 23 Jul 2007 11:43:24 +0000 Received: (qmail 19405 invoked from network); 23 Jul 2007 11:43:22 -0000 Received: from unknown (HELO gateway) (10.0.0.100) by mail.codesourcery.com with SMTP; 23 Jul 2007 11:43:22 -0000 Received: by gateway (Postfix, from userid 1010) id 744416C12C; Mon, 23 Jul 2007 04:43:22 -0700 (PDT) From: Richard Sandiford To: binutils@sourceware.org Mail-Followup-To: binutils@sourceware.org, richard@codesourcery.com Subject: Fix run_list_test for MIPS gas Date: Mon, 23 Jul 2007 13:20:00 -0000 Message-ID: <87ejiz5orr.fsf@firetop.home> User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2007-07/txt/msg00353.txt.bz2 I'm getting the following testsuite output for MIPS gas: ----------------------------------------------------------------------- ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" ERROR: wrong # args: should be "run_list_test name opts" FAIL: MIPS ELF reloc 2 (32-bit) FAIL: MIPS ld-st-la constants (ABI o32) FAIL: MIPS ld-st-la constants (ABI o32, shared) ERROR: tcl error sourcing /scratch/richard/binutils/HEAD/src/gas/testsuite/gas/mips/mips.exp. ERROR: wrong # args: should be "run_list_test name opts" while executing "run_list_test "ldstla-32-1" "-mabi=32" "MIPS ld-st-la bad constants (ABI o32)"" invoked from within "if { [istarget mips*-*-vxworks*] } { run_dump_test "vxworks1" run_dump_test "vxworks1-xgot" run_dump_test "vxworks1-el" run_dump_test ..." (file "/scratch/richard/binutils/HEAD/src/gas/testsuite/gas/mips/mips.exp" line 369) invoked from within "source /scratch/richard/binutils/HEAD/src/gas/testsuite/gas/mips/mips.exp" ("uplevel" body line 1) invoked from within "uplevel #0 source /scratch/richard/binutils/HEAD/src/gas/testsuite/gas/mips/mips.exp" invoked from within "catch "uplevel #0 source $test_file_name"" ----------------------------------------------------------------------- There are two problems: mips.exp uses run_list_test with no options argument, and cr16.exp overrides the gas-defs.exp definition before mips.exp runs. I think the best fix for the first problem is to make the options optional. For the second, it's trivially safe to delete the cr16.exp definition because cr16.exp contains no list tests. Tested on mipsisa64-elf. OK to install? Richard gas/testsuite/ * lib/gas-defs.exp (run_list_test): Make the options optional. * gas/cr16/cr16.exp (run_list_test): Delete. Index: gas/testsuite/lib/gas-defs.exp =================================================================== RCS file: /cvs/src/src/gas/testsuite/lib/gas-defs.exp,v retrieving revision 1.26 diff -u -p -r1.26 gas-defs.exp --- gas/testsuite/lib/gas-defs.exp 3 Jul 2007 11:01:12 -0000 1.26 +++ gas/testsuite/lib/gas-defs.exp 23 Jul 2007 11:41:18 -0000 @@ -890,14 +890,14 @@ if ![string length [info proc prune_warn } } -# run_list_test NAME OPTS (optional): TESTNAME +# run_list_test NAME (optional): OPTS TESTNAME # # Assemble the file "NAME.d" with command line options OPTS and # compare the assembler standard error output against thee regular # expressions given in the file "NAME.l". If TESTNAME is provided, # it will be used as the name of the test. -proc run_list_test { name opts {testname {}} } { +proc run_list_test { name {opts {}} {testname {}} } { global srcdir subdir if { [string length $testname] == 0 } then { set testname "[file tail $subdir] $name" Index: gas/testsuite/gas/cr16/cr16.exp =================================================================== RCS file: /cvs/src/src/gas/testsuite/gas/cr16/cr16.exp,v retrieving revision 1.1 diff -u -p -r1.1 cr16.exp --- gas/testsuite/gas/cr16/cr16.exp 29 Jun 2007 14:09:31 -0000 1.1 +++ gas/testsuite/gas/cr16/cr16.exp 23 Jul 2007 11:41:18 -0000 @@ -2,19 +2,6 @@ # Driver for CR16 assembler testsuite # -proc run_list_test { name opts } { - global srcdir subdir - set testname "cr16 $name" - set file $srcdir/$subdir/$name - gas_run ${name}.s $opts ">&dump.out" - if {[regexp_diff "dump.out" "${file}.l"] } { - fail $testname - verbose "output is [file_contents "dump.out"]" 2 - return - } - pass $testname -} - if ![istarget cr16-*-*] { return }