From patchwork Wed Jan 25 19:15:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 137837 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 1ECE6B6F65 for ; Thu, 26 Jan 2012 06:16:13 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1328123774; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:From:To:Subject:Date:Message-ID:User-Agent: MIME-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=q571zBVOQx4ixfLKPY67o9Sq2tI=; b=LvpGQP0eZKBnCI/ EeqThYeKCabtY1emEJASNWIFpXOoNE3+0fw9qytA9TNE+8q7JDWrjF+fgNtkdS0N /xJFZF7refXGnsxqIxIQ2NP25FN4dS/DrE69TskOanNuYVTiTkLTqxP3LThJk8n9 XzPS+glHzL77i55gcRSHOJgUkxYo= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Received:From:To:Subject:Date:Message-ID:User-Agent:MIME-Version:X-Gm-Message-State:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=n2r9RRcyEvVFGoF4KzsPi6OwjOhbXc93LYESdh9lrTgRgf4/U3jrgmn/sYN8+o 5Cs627DLyFAAqVGI68Pts5afV5V80ystqdEZsXmN3tJDuWXVrCcSYslJkh11UnWF fJn/s0Ywj6wuS/U+BhdCXDs1dbe2hobhyFp84HVyjZNIs=; Received: (qmail 1293 invoked by alias); 25 Jan 2012 19:16:10 -0000 Received: (qmail 1280 invoked by uid 22791); 25 Jan 2012 19:16:09 -0000 X-SWARE-Spam-Status: No, hits=-2.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from mail-gx0-f175.google.com (HELO mail-gx0-f175.google.com) (209.85.161.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 25 Jan 2012 19:15:52 +0000 Received: by ggnp4 with SMTP id p4so2792849ggn.20 for ; Wed, 25 Jan 2012 11:15:52 -0800 (PST) Received: by 10.50.183.166 with SMTP id en6mr19879792igc.7.1327518951826; Wed, 25 Jan 2012 11:15:51 -0800 (PST) Received: by 10.50.183.166 with SMTP id en6mr19879778igc.7.1327518951709; Wed, 25 Jan 2012 11:15:51 -0800 (PST) Received: from coign.google.com ([2620:0:1000:2301:f2de:f1ff:fe40:72a8]) by mx.google.com with ESMTPS id ba5sm337854igb.6.2012.01.25.11.15.50 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 Jan 2012 11:15:51 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: Go patch committed: Handle a few more test lines Date: Wed, 25 Jan 2012 11:15:49 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlva8+OyzE6bT16WbRIvqDWT/0zDk6ijrzvMWBbKQftpJdo3yVooc1An5P7CgxYyRZH70kUVPKi3Yur62w6HDQyJKMHZqYnNIqr3gDiu87pkPxsMVfkbNq1nif4Ulk8Y8vtF6RV2ZdGj22HYad635sLAv3ewx0FyCT93w5jYdp1iofhf4o= X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org I somehow missed a few test lines in the updated Go testsuite, causing the tests to be marked as unsupported. This patch updates the driver to handle them. Fortunately they all pass. Ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian 2012-01-25 Ian Lance Taylor * go.test/go-test.exp (go-gc-tests): Handle a few more test lines. Index: go.test/go-test.exp =================================================================== --- go.test/go-test.exp (revision 183529) +++ go.test/go-test.exp (working copy) @@ -448,6 +448,7 @@ proc go-gc-tests { } { go-torture-execute $test file delete core [glob -nocomplain core.*] } elseif { $test_line == "// \$G \$D/\$F.go && \$L \$F.\$A && ./\$A.out 2>&1 | cmp - \$D/\$F.out" \ + || $test_line == "// \$G \$F.go && \$L \$F.\$A && ./\$A.out 2>&1 | cmp - \$D/\$F.out" \ || $test_line == "// (\$G \$D/\$F.go && \$L \$F.\$A && ./\$A.out 2>&1 | cmp - \$D/\$F.out)" } { # This is an execution test for which we need to check the # program output. @@ -493,7 +494,8 @@ proc go-gc-tests { } { || [string match "// \$G \$F.go || echo BUG*" \ $test_line] \ || [string match "// ! \$G \$D/\$F.go && echo BUG*" \ - $test_line] } { + $test_line] \ + || $test_line == "// echo bug395 is broken # takes 90+ seconds to break" } { # This is a vanilla compile test. set dg-do-what-default "assemble" go-dg-runtest $test "-w $DEFAULT_GOCFLAGS" @@ -854,11 +856,17 @@ proc go-gc-tests { } { } file delete $ofile0 $ofile1 $ofile2 $output_file set runtests $hold_runtests - } elseif { $test_line == "// \$G \$D/import2.go && \$G \$D/\$F\.go" } { + } elseif { $test_line == "// \$G \$D/import2.go && \$G \$D/\$F\.go" \ + || $test_line == "// \$G \$D/recursive1.go && \$G \$D/\$F.go" } { + if { $test_line == "// \$G \$D/import2.go && \$G \$D/\$F\.go" } { + set name1 "import2.go" + } elseif { $test_line == "// \$G \$D/recursive1.go && \$G \$D/\$F.go" } { + set name1 "recursive1.go" + } set hold_runtests $runtests set runtests "go-test.exp" set dg-do-what-default "assemble" - regsub "/\[^/\]*$" $test "/import2.go" file1 + regsub "/\[^/\]*$" $test "/${name1}" file1 dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS" set ofile1 "[file rootname [file tail $file1]].o" dg-test $test "-O" "-w $DEFAULT_GOCFLAGS"