From patchwork Wed Feb 1 21:02:11 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: 139005 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 CBFAA1007D1 for ; Thu, 2 Feb 2012 08:02:40 +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=1328734961; 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=nOU11B703pi1Je+9zIcWD1XWSZk=; b=xf6GWZUQAIABJVJ O5I73lITm1l4odLDEXRVWD35MyDyU65dlzGMq8naTf0dYuVO4Tjqai2SGizuH7dO +jsBmGTxUwPDbR//VB+xMDn+ZqinoaXYGG08jEZYmD0unAgGBL+MMUDcflT6cphl M56SrIs1Q5cNlU3RUMH/Tmug1q4s= 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:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=d7nF0XdxLqRgx1YXa2exwnnebueDneIKalC+HS+lsZM6Kmezky7pkgnYRHgAg0 bWk4PaVI3/HtVvdnlCZMCFCAE7NxGF6iBFdUtS1Yt24XLYbQX+o3TuwH2L0eg2B4 53OpERONdAonsDvgvvhjN4DxbVBUk46vZt9t0thRXKMks=; Received: (qmail 27279 invoked by alias); 1 Feb 2012 21:02:36 -0000 Received: (qmail 27269 invoked by uid 22791); 1 Feb 2012 21:02:35 -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-pw0-f47.google.com (HELO mail-pw0-f47.google.com) (209.85.160.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 01 Feb 2012 21:02:13 +0000 Received: by pbbb4 with SMTP id b4so1399387pbb.20 for ; Wed, 01 Feb 2012 13:02:13 -0800 (PST) Received: by 10.68.134.68 with SMTP id pi4mr916409pbb.56.1328130133557; Wed, 01 Feb 2012 13:02:13 -0800 (PST) Received: by 10.68.134.68 with SMTP id pi4mr916389pbb.56.1328130133460; Wed, 01 Feb 2012 13:02:13 -0800 (PST) Received: from coign.google.com ([2620:0:1000:2301:f2de:f1ff:fe40:72a8]) by mx.google.com with ESMTPS id a5sm823732pbh.15.2012.02.01.13.02.12 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Feb 2012 13:02:12 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Make sure file is not closed early Date: Wed, 01 Feb 2012 13:02:11 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 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 fixes the test for leaked file descriptors. In some cases the file, expected to be open, could be collected by the garbage collector and closed. This then caused the next call to open to return that descriptor rather than the expected one, causing the test to fail. This patch adds an explicit close, ensuring that the file can not be collected. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian Index: libgo/go/os/exec/exec_test.go =================================================================== --- libgo/go/os/exec/exec_test.go (revision 183650) +++ libgo/go/os/exec/exec_test.go (working copy) @@ -292,6 +292,7 @@ func TestHelperProcess(*testing.T) { f.Close() } } + fd3.Close() os.Stderr.Write(bs) case "exit": n, _ := strconv.Atoi(args[0])