From patchwork Fri Apr 20 04:49:38 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: 153926 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 94F67B7034 for ; Fri, 20 Apr 2012 14:50:02 +1000 (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=1335502202; 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=KGDnJu2miCdaAD0G2gSFZOzH/+c=; b=Xuf8rJs9sszoQSW FAPDzBHypKu45o4AoTXOJgRweacCxed7gOnzhVxoKgXonaX+01uYwSXVZFdv1cnN fblM+ipRUZZ/6bPMBRfu/tQh/v5excmP/g4KsWX0fWxI/2Ta16Xz4/dZdSdmxiEH K9L141iCC4kUnqamQ7BARHqahlHo= 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:X-Google-DKIM-Signature:Received:Received:Received:From:To:Subject:Date:Message-ID:User-Agent:MIME-Version:Content-Type:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=THXCbjc7auDl5qxYpzW1QDoMdWthchEaGoqIQC/1RsmLbFj2P1R5Zs+KthIu7R JPmzYbysLcWdB9r4UkkQMYT1+NenbCJagJvW6yv/wh7qwYYaL6AcV2GSnmjmwoFs UyhfZM10KLueVvYdGWq+A8D+l4LO7YMyRryzkwm0Fyv80=; Received: (qmail 30295 invoked by alias); 20 Apr 2012 04:49:56 -0000 Received: (qmail 30286 invoked by uid 22791); 20 Apr 2012 04:49:54 -0000 X-SWARE-Spam-Status: No, hits=-4.4 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from mail-pb0-f47.google.com (HELO mail-pb0-f47.google.com) (209.85.160.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 20 Apr 2012 04:49:41 +0000 Received: by pbcum15 with SMTP id um15so577469pbc.20 for ; Thu, 19 Apr 2012 21:49:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:user-agent:mime-version :content-type:x-gm-message-state; bh=oUkMCuQvQi68CX2cALG7Hk5/fxfgisYOY/e7Ezbc080=; b=hY7ooUiWj2tmaXrk00UKPuUSdEOjvOgJtbIBnnPCftYqy1ZHcswf1mmsKpobcgMtNT pb6BqflzhPVA5i20a6tG1o116k1WLHwvgh94rth/TGHlUM6Kb1LFt2xBEtUh26WYu8Qr JD+X10Zs0i0x3vdkb5H5tn8YwyaRN8U8I1lpvyRLtASXS8V5qvayP2u6HfaFy7qTprGC uEX62UBMYltEloioZ+RxqOEeTKisAjzkWVJDni984cef2zevCmyFiLbpcCNmZzSdSDsQ IpVUFozgji2PT+Ur4yEqL2nDn8w9QJKItclXw461gyHPLNYIO0zMYx9sEPCdjgblyVB2 40BA== Received: by 10.68.201.98 with SMTP id jz2mr9927087pbc.97.1334897381310; Thu, 19 Apr 2012 21:49:41 -0700 (PDT) Received: by 10.68.201.98 with SMTP id jz2mr9927067pbc.97.1334897381191; Thu, 19 Apr 2012 21:49:41 -0700 (PDT) Received: from coign.google.com ([216.239.45.130]) by mx.google.com with ESMTPS id sx2sm4215824pbc.26.2012.04.19.21.49.40 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 21:49:40 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Fix testsuite for PPC Date: Thu, 19 Apr 2012 21:49:38 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnnPoMr/awKG7WkvOTugbn8bqQ2LRGQcVbuW3lW3mmWQWvbtYZf/ndhuN4tAaShuUFiaBzwcGwVTbtnZq9HnEO9Ck//j1Tt9GVJ2wUBj2AG4bHGdKqbI4GsHVLPlvZY4ruEsPAXZFWwlJcbYjDw/jPm6OxuveuTH22z6dWyD9Or3nk6BrY= 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 The change to the libgo testsuite script to look at data symbols for function descriptors on PowerPC caused the script to pick up interface method tables and the like for types named Test*. This patch adds a grep -v to trim those out again. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu and powerpc64-unknown-linux-gnu. Committed to mainline and 4.7 branch. Ian diff -r 2ba470ed797c libgo/testsuite/gotest --- a/libgo/testsuite/gotest Mon Apr 16 16:03:29 2012 -0700 +++ b/libgo/testsuite/gotest Thu Apr 19 21:44:55 2012 -0700 @@ -347,18 +347,18 @@ pattern='Test([^a-z].*)?' # The -p option tells GNU nm not to sort. # The -v option tells Solaris nm to sort by value. - tests=$($NM -p -v _gotest_.o $xofile | egrep " $text .*\."$pattern'$' | grep -v '\..*\..*\.' | fgrep -v '$' | sed 's/.* //' | sed 's/.*\.\(.*\.\)/\1/') + tests=$($NM -p -v _gotest_.o $xofile | egrep " $text .*\."$pattern'$' | grep -v '\..*\..*\.' | fgrep -v '$' | fgrep -v ' __go_' | sed 's/.* //' | sed 's/.*\.\(.*\.\)/\1/') if [ "x$tests" = x ]; then echo 'gotest: warning: no tests matching '$pattern in _gotest_.o $xofile 1>&2 exit 2 fi # benchmarks are named BenchmarkFoo. pattern='Benchmark([^a-z].*)?' - benchmarks=$($NM -p -v _gotest_.o $xofile | egrep ' T .*\.'$pattern'$' | grep -v '\..*\..*\.' | fgrep -v '$' | sed 's/.* //' | sed 's/.*\.\(.*\.\)/\1/') + benchmarks=$($NM -p -v _gotest_.o $xofile | egrep " $test .*\."$pattern'$' | grep -v '\..*\..*\.' | fgrep -v '$' | fgrep -v ' __go_' | sed 's/.* //' | sed 's/.*\.\(.*\.\)/\1/') # examples are named ExampleFoo pattern='Example([^a-z].*)?' - examples=$($NM -p -v _gotest_.o $xofile | egrep ' T .*\.'$pattern'$' | grep -v '\..*\..*\.' | fgrep -v '$' | sed 's/.* //' | sed 's/.*\.\(.*\.\)/\1/') + examples=$($NM -p -v _gotest_.o $xofile | egrep " $text .*\."$pattern'$' | grep -v '\..*\..*\.' | fgrep -v '$' | fgrep -v ' __go_' | sed 's/.* //' | sed 's/.*\.\(.*\.\)/\1/') # package spec echo 'package main'