From patchwork Tue Apr 24 20:13:24 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: 154754 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 57655B6F62 for ; Wed, 25 Apr 2012 06:13:47 +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=1335903228; 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=VJkKGdcKBX8eJNl5AufeMVauMBg=; b=P8m7+BJXQh365nM eKRluQNZ6pCI4PMZOOEZwNR5A8c9dX7tUtnBz1D43bYjbnM968yd+9+8v/b2QQKc hhrO/BdQVbxfiu1eKTrDrbgOglf8dJPZHkbFS8PEtAOJngGfnguG2hHv5cnZf0Xp mMkfv7ZGTqm5vtDN2edArtkanCVc= 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=boZg5FKlyT+M+YBnLL9WBv7rddayMh1ZZvfKHqgmJe56bLWHCt8C8sJpU/sdAD iXiyI3uIu86No1duCyJHyzAMd+NMdScRJhz/vCgwMAALGWXXJzE9TncfCTIWJzuF 73TFTD5tQPthbCSBHricihea65lTDm5g3RwYPF00zrtQA=; Received: (qmail 20236 invoked by alias); 24 Apr 2012 20:13:42 -0000 Received: (qmail 20224 invoked by uid 22791); 24 Apr 2012 20:13:40 -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; Tue, 24 Apr 2012 20:13:27 +0000 Received: by pbcum15 with SMTP id um15so509822pbc.20 for ; Tue, 24 Apr 2012 13:13:26 -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=GLxgBLb0rdV0n0OIbonb1/xb1lKxez6/Rpp1iYueaxY=; b=iBnp0ssplx5xYnJbB+S6i5QzJO+lJLQamFRbMfS3zaj2lxzzx9GLbMykn/mb4qzbRP PmLEYAZq0Np4Nx750SB/7R+3w+JFVgpa4sf6xvZMJqx/0PCzDlmk1OftEH12d4QD7/e1 EFkXRFAFC11cnPkHfYHOSlmIUOrvqYtJqduGSIWDPAZoRgPhxTfkH5fe2Y70SjeFFLFQ CgZQxNN7YGgRC/KT0mm7yrvuKgVMfigptZcwBfYqqBA4eCHRAp53dZmXxB7dylJ+M+zq 4hf2STPrYbSjhM7ObFeD+pU2OWdkug3HxtvTKmRRaiszD8kCSuI1FIcr1IO1XbBsknNy DBoA== Received: by 10.68.138.134 with SMTP id qq6mr932810pbb.8.1335298406888; Tue, 24 Apr 2012 13:13:26 -0700 (PDT) Received: by 10.68.138.134 with SMTP id qq6mr932781pbb.8.1335298406751; Tue, 24 Apr 2012 13:13:26 -0700 (PDT) Received: from coign.google.com ([216.239.45.130]) by mx.google.com with ESMTPS id d4sm18283457pbe.36.2012.04.24.13.13.25 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Apr 2012 13:13:26 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Remove race in use of ../testdata Date: Tue, 24 Apr 2012 13:13:24 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmr1gu2ONKr1QDLuZ/JyAHBPGwbygtvsYkr3Yzao1MchpVGOKw7XjP2gg5YObHlsSVsFau/4FepDM4fkQefn+hKEgHKZufATgz3ctDKhqGxd8ZcZmUSkbbsz2927g1CpxBXhy3GXbXX60ooiwHecudW7rwAU4iYAnqrhK+pCLwWW55yvA8= 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 the libgo testsuite driver removes a race in the use of the ../testdata directory. This is PR go/52462. Ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline and 4.7 branch. Ian diff -r 0b5618e33848 libgo/testsuite/gotest --- a/libgo/testsuite/gotest Tue Apr 24 12:11:37 2012 -0700 +++ b/libgo/testsuite/gotest Tue Apr 24 13:10:27 2012 -0700 @@ -136,18 +136,20 @@ mkdir $DIR cd $DIR +mkdir test +cd test if test $keep = false; then - trap "cd ..; rm -rf $DIR" 0 1 2 3 14 15 + trap "cd ../..; rm -rf $DIR" 0 1 2 3 14 15 else - trap "cd ..; echo Keeping $DIR" 0 1 2 3 14 15 + trap "cd ../..; echo Keeping $DIR" 0 1 2 3 14 15 fi case "$srcdir" in /*) ;; *) - srcdir="../$srcdir" + srcdir="../../$srcdir" ;; esac @@ -158,7 +160,7 @@ /*) ;; *) - basedir="../$basedir" + basedir="../../$basedir" ;; esac @@ -189,10 +191,10 @@ b=`basename $f` rm -f $b cp $basedir/$f $b - elif test -f ../$f; then + elif test -f ../../$f; then b=`basename $f` rm -f $b - cp ../$f $b + cp ../../$f $b else echo "file $f not found" 1>&2 exit 1 @@ -224,10 +226,10 @@ b=`basename $f` rm -f $b cp $basedir/$f $b - elif test -f ../$f; then + elif test -f ../../$f; then b=`basename $f` rm -f $b - cp ../$f $b + cp ../../$f $b else echo "file $f not found" 1>&2 exit 1 @@ -455,27 +457,27 @@ exit $status ;; xyes) - rm -rf ../testsuite/*.o + rm -rf ../../testsuite/*.o files=`echo *` for f in $files; do if test "$f" = "_obj" || test "$f" = "_test"; then continue fi - rm -rf ../testsuite/$f + rm -rf ../../testsuite/$f if test -f $f; then - cp $f ../testsuite/ + cp $f ../../testsuite/ else - ln -s ../$DIR/$f ../testsuite/ + ln -s ../$DIR/test/$f ../../testsuite/ fi done - cd ../testsuite + cd ../../testsuite rm -rf _obj _test mkdir _obj _test if test "$testname" != ""; then GOTESTNAME="$testname" export GOTESTNAME fi - $MAKE check RUNTESTFLAGS="$RUNTESTFLAGS GOTEST_TMPDIR=$DIR" + $MAKE check RUNTESTFLAGS="$RUNTESTFLAGS GOTEST_TMPDIR=$DIR/test" # Useful when using make check-target-libgo cat libgo.log >> libgo-all.log cat libgo.sum >> libgo-all.sum