From patchwork Tue Feb 5 22:22:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 218454 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 0EAF92C02B1 for ; Wed, 6 Feb 2013 09:22:41 +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=1360707762; h=Comment: DomainKey-Signature: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=T4yhgsu fZN0QSHXMbzHCPgaY/dE=; b=jRWl1+PKEYC76sUJBqNQ7V+Y76/c2LWbREObyFO SOffgGfbo2OXJVVeN6Ao/ol2Mg9fN7InLwxaYUxFTGUew1/N/bPHsGx2z8uXdJbA t/Aua3PmU6hrq4FEe0/k+a88ESzR8DY4bSFSyYSr8Qr8/c7gFGNEgOUSZe/+lt8D B+KM= 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:X-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=URVw31jlDxC/Iu3JH79wK9H3xuAv9IHFtgaYEw1KAO9kyPFiTneyGcdxx+XWCQ JFiM2wTZed0qv1ATlu9e5bjB/9Zchn51h9VhlkPCZ881SZJLoSwWQO/At2PQBI73 Cx/WXRFM2xdCqo0QaSF83IR+yKusn7NEXydTU02QQyR+I=; Received: (qmail 22720 invoked by alias); 5 Feb 2013 22:22:31 -0000 Received: (qmail 22698 invoked by uid 22791); 5 Feb 2013 22:22:29 -0000 X-SWARE-Spam-Status: No, hits=-4.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from mail-da0-f42.google.com (HELO mail-da0-f42.google.com) (209.85.210.42) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 05 Feb 2013 22:22:25 +0000 Received: by mail-da0-f42.google.com with SMTP id z17so277347dal.15 for ; Tue, 05 Feb 2013 14:22:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:subject:date:message-id:user-agent:mime-version :content-type:x-gm-message-state; bh=Ry+P8caD91TOJr5SdKlie3D3g75sDp4dD7gsP+vfkOE=; b=SPklkcKoYas0wBTMyWi6DTJE3AhoPtCSxdsVg+0pZZY3crj3qKbYaUN1kNyAoXbSLD EIF9YaA5/13bzdAPuBpF6zyYkaQ2bnXrX/R9IgtphRielkDDosItSeVfJQu259oMrGaN Sm3z9VQByHXz2CGTgCjzgIFl0laDW105DvCACSXeZZDK3mxY1r9NVbhmW+FlOHVDwqmT 1vG838oKDkP5E7kaZdeS77obalvFitKquGNoHDRGYd94kTMkT10IWtFkXJPmMw11hKP8 fSCD/GfI8E3a2g0uEm7aBORSjO0b0IEuy49y0ULKD8kBCcrugDeoRGQTstPenZaSGawA kfqA== X-Received: by 10.66.83.6 with SMTP id m6mr68567528pay.52.1360102944618; Tue, 05 Feb 2013 14:22:24 -0800 (PST) Received: from iant-glaptop.google.com ([2620:0:1000:3204:95a2:3fa2:12af:7c65]) by mx.google.com with ESMTPS id a4sm32482046paw.21.2013.02.05.14.22.23 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 05 Feb 2013 14:22:24 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Use DejaGNU when testing a cross-compiler Date: Tue, 05 Feb 2013 14:22:21 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQk3MTUMJybNQFU/tZWAX9EfaVGtetNkn+gT6U9srGckLFg+9GkUdDsWmN0Ou8sH/KqF+lymYGrMcVmO/uwIF3OO+0XtUR6eoGJVOdlwmP4S2KXgFb9QHxb6vDApKlF8QKsI9ML95iBEL/Hqfr8SirlI2tfzhYHVU/xQvBQutqTPWjVC2OjPUZ/efYOIfy2RnHZlBmcE 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 This patch to libgo uses DejaGNU when testing a cross-compiler. The shell script is simpler but only works for a native configuration. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. This should fix PR 56017. Ian diff -r 27e1a46c9cc2 libgo/Makefile.am --- a/libgo/Makefile.am Mon Feb 04 17:10:28 2013 -0800 +++ b/libgo/Makefile.am Tue Feb 05 14:13:17 2013 -0800 @@ -1991,12 +1991,6 @@ files=`echo $^ | sed -e 's/[^ ]*\.gox//g'`; \ $(LTGOCOMPILE) -I . -c -fgo-pkgpath=`echo $@ | sed -e 's/.lo$$//' -e 's/-go$$//'` -o $@ $$files -if LIBGO_IS_RTEMS -use_dejagnu = yes -else -use_dejagnu = no -endif - GOTESTFLAGS = # Check a package. @@ -2015,7 +2009,7 @@ export LD_LIBRARY_PATH; \ $(MKDIR_P) $(@D); \ rm -f $@-testsum $@-testlog; \ - if test "$(use_dejagnu)" = "yes"; then \ + if test "$(USE_DEJAGNU)" = "yes"; then \ $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" --goarch="$(GOARCH)" $(GOTESTFLAGS) $(go_$(subst /,_,$(@D))_test_files); \ else \ if $(SHELL) $(srcdir)/testsuite/gotest --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --goarch="$(GOARCH)" $(GOTESTFLAGS) $(go_$(subst /,_,$(@D))_test_files) >>$@-testlog 2>&1; then \ diff -r 27e1a46c9cc2 libgo/configure.ac --- a/libgo/configure.ac Mon Feb 04 17:10:28 2013 -0800 +++ b/libgo/configure.ac Tue Feb 05 14:13:17 2013 -0800 @@ -156,6 +156,17 @@ AM_CONDITIONAL(LIBGO_IS_SOLARIS, test $is_solaris = yes) AC_SUBST(GOOS) +dnl Test whether we need to use DejaGNU or whether we can use the +dnl simpler gotest approach. We can only use gotest for a native +dnl build. +USE_DEJAGNU=no +case ${host} in + *-*-rtems*) USE_DEJAGNU=yes ;; + ${target}) ;; + *) USE_DEJAGNU=yes ;; +esac +AC_SUBST(USE_DEJAGNU) + dnl N.B. Keep in sync with gcc/testsuite/go.test/go-test.exp (go-set-goarch). is_386=no is_alpha=no