From patchwork Fri Jan 21 22:01:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 79948 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 95C77B70EB for ; Sat, 22 Jan 2011 09:01:30 +1100 (EST) Received: (qmail 4366 invoked by alias); 21 Jan 2011 22:01:29 -0000 Received: (qmail 4356 invoked by uid 22791); 21 Jan 2011 22:01:28 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 21 Jan 2011 22:01:12 +0000 Received: from kpbe17.cbf.corp.google.com (kpbe17.cbf.corp.google.com [172.25.105.81]) by smtp-out.google.com with ESMTP id p0LM1A7Z018843 for ; Fri, 21 Jan 2011 14:01:10 -0800 Received: from vws12 (vws12.prod.google.com [10.241.21.140]) by kpbe17.cbf.corp.google.com with ESMTP id p0LM18Zx012380 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NOT) for ; Fri, 21 Jan 2011 14:01:09 -0800 Received: by vws12 with SMTP id 12so937086vws.32 for ; Fri, 21 Jan 2011 14:01:08 -0800 (PST) Received: by 10.220.175.130 with SMTP id ba2mr316000vcb.24.1295647268471; Fri, 21 Jan 2011 14:01:08 -0800 (PST) Received: from coign.google.com (dhcp-172-22-120-199.mtv.corp.google.com [172.22.120.199]) by mx.google.com with ESMTPS id s6sm791407vch.47.2011.01.21.14.01.07 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 21 Jan 2011 14:01:08 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Fix race condition in test Date: Fri, 21 Jan 2011 14:01:06 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-System-Of-Record: true 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 a race condition in a test. This is copied from the master sources. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r 893744d8974a libgo/go/net/dnsname_test.go --- a/libgo/go/net/dnsname_test.go Fri Jan 21 08:33:04 2011 -0800 +++ b/libgo/go/net/dnsname_test.go Fri Jan 21 13:58:40 2011 -0800 @@ -27,7 +27,7 @@ {"a.b..com", false}, } -func getTestCases(ch chan<- *testCase) { +func getTestCases(ch chan<- testCase) { defer close(ch) var char59 = "" var char63 = "" @@ -39,17 +39,17 @@ char64 = char63 + "a" for _, tc := range tests { - ch <- &tc + ch <- tc } - ch <- &testCase{char63 + ".com", true} - ch <- &testCase{char64 + ".com", false} + ch <- testCase{char63 + ".com", true} + ch <- testCase{char64 + ".com", false} // 255 char name is fine: - ch <- &testCase{char59 + "." + char63 + "." + char63 + "." + + ch <- testCase{char59 + "." + char63 + "." + char63 + "." + char63 + ".com", true} // 256 char name is bad: - ch <- &testCase{char59 + "a." + char63 + "." + char63 + "." + + ch <- testCase{char59 + "a." + char63 + "." + char63 + "." + char63 + ".com", false} } @@ -58,7 +58,7 @@ if runtime.GOOS == "windows" { return } - ch := make(chan *testCase) + ch := make(chan testCase) go getTestCases(ch) for tc := range ch { if isDomainName(tc.name) != tc.result {