From patchwork Sun Jul 20 15:21:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 371933 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AE00D1400B2 for ; Mon, 21 Jul 2014 01:22:20 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; q=dns; s= default; b=rjL6NTFLK9sayHj1uL6Och38ydS0bVhEkNmejWviQJIRK1JvxZngs 9X93Ni65kzxcx+r22eshSQu/v+o64QijuVlMDbKts3aXhx1qTQFoswnn3kpEs0rK ggGiX4MQW1kyvDM/NKzg7WK2VyyPcED8Sy5bLeew6sIAJR8ls8tdss= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; s= default; bh=GMKc+WV5QLN1BlAeB5vJLFJJAPg=; b=tAPT+hpijJA8j4fVEUmp E3WGoSQjPhK50hpx7VuIaYAYkNP+Tg48la7aZ64YR/WCsoOxMXrZSBIHEXLORBb1 61Ua184IfS/2di7skyIfM3O65N614lw7uUHeYbts+cdAHl5texzG+T0c6YH9KCs1 a6zwvQUR9HOaz4xzianCyeM= Received: (qmail 26654 invoked by alias); 20 Jul 2014 15:22:12 -0000 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 Received: (qmail 26559 invoked by uid 89); 20 Jul 2014 15:22:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS, T_TVD_MIME_NO_HEADERS autolearn=ham version=3.3.2 X-HELO: mail-wg0-f49.google.com Received: from mail-wg0-f49.google.com (HELO mail-wg0-f49.google.com) (74.125.82.49) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Sun, 20 Jul 2014 15:22:05 +0000 Received: by mail-wg0-f49.google.com with SMTP id k14so5505617wgh.32 for ; Sun, 20 Jul 2014 08:22:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:user-agent :mime-version:content-type; bh=2bdqts3YY+sluUQZPDFKNZwBdbPsBjp4IckoOhkmrNE=; b=VVaQjYZ5VvwJcGE0LgDUXbluo4eh6b3UVM+2ZLjN81S1EOfGpE6p8D7XzehoxRjLKL jbXV2NSH01FcKS4zuDJd9JHFwvxzx22IcHuBBO9Uf0Z3tmTTr1uGXerSAxvR4E2gH113 KIvjZdL4oK8Se0MBaDbBgQk7fwC4ffhiN4l2xrqD51JmHZULwJWApnDKM8lNBJJskZFN n6M2hAX+wFTZh9Z93eLigdEyBQSlmUwIAeSzGudDuPLmrVvD/2Sb5FeWYK3f/pez53IT 8bWF90JabK+Nr1Mi0ZzulBCzUk9yJOgQRRV71XcdUIuN5I4+LJneKsW7OwUW83q6oQmo dDuw== X-Gm-Message-State: ALoCoQncphVQHuA+TlSifxtBKgCEKLW0uGEUV+BVfLG6ndMn0lgVGjpHkX8yjoVpYHY7OwimjFsB X-Received: by 10.180.10.166 with SMTP id j6mr19422060wib.73.1405869722277; Sun, 20 Jul 2014 08:22:02 -0700 (PDT) Received: from iant-glaptop.roam.corp.google.com.google.com (global-1-18.nat.csx.cam.ac.uk. [131.111.184.18]) by mx.google.com with ESMTPSA id ey16sm31072924wid.14.2014.07.20.08.22.00 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 20 Jul 2014 08:22:01 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: Go testsuite patch committed: compiledir fix Date: Sun, 20 Jul 2014 08:21:59 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-IsSubscribed: yes This patch to the Go testsuite driver adds support for having multiple files in a single package for a compiledir test. Ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian 2014-07-20 Ian Lance Taylor * go.test/go-test.exp (go-gc-tests): Support multiple files in one package for compiledir tests. Index: go-test.exp =================================================================== --- go-test.exp (revision 212213) +++ go-test.exp (working copy) @@ -651,13 +651,17 @@ proc go-gc-tests { } { set runtests "go-test.exp" set dg-do-what-default "assemble" set dir "[file rootname $test].dir" - set del {} - foreach f [lsort [glob "$dir/*.go"]] { - dg-test -keep-output $f "-O" "-w $DEFAULT_GOCFLAGS" - lappend del "[file rootname [file tail $f]].o" - } - foreach f $del { - file delete $f + set files [lsort [glob "$dir/*.go"]] + set packages [go-find-packages $test $name $files] + if { [llength $packages] > 0 } { + set del [list] + foreach p $packages { + dg-test -keep-output [lindex $p 1] "[lrange $p 2 end] -O" "-w $DEFAULT_GOCFLAGS" + lappend del "[file rootname [file tail [lindex $p 1]]].o" + } + foreach f $del { + file delete $f + } } set runtests $hold_runtests } elseif { $test_line == "// rundir" } {