From patchwork Fri Apr 7 21:07:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 81051 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp527120vqo; Fri, 7 Apr 2023 14:08:41 -0700 (PDT) X-Google-Smtp-Source: AKy350YyJ2cdUpU93f4I7WqDHD5DrQU6XdD4XgDFDAMPb8TXJnSFD7VhffI+Y7hb/wVBsVWO3sD7 X-Received: by 2002:a17:907:c02:b0:93f:fbe:c389 with SMTP id ga2-20020a1709070c0200b0093f0fbec389mr821874ejc.13.1680901720727; Fri, 07 Apr 2023 14:08:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680901720; cv=none; d=google.com; s=arc-20160816; b=NUUzjbmXM5dbL4ivj3JNB4owddkRXhm3AJeB/BY/Kz2dG6E951ZG1Fd6AlKyhNkVIp autAbPj5wPu65H2GaUOFM0K0MDBXwtG8HxoNICjG7mEV+V4aiSqW0Mxu1cdoowJa2ktH 2CwCcQSb9aGLrajI8FzEUL/ISXQpWH4SnsSU0OR94P3YO0kOjbcYbzGdEGy4qO/Jwvns GX45UNYgxruz+dVwHUOy2NsQ/lqxIptCJDEmrdh0YnIJ/dX2Ywzr8eoMR6EoF8VkOlYz aol4/855Asuv+boUZLvxhLlKW0eMRMV6g+9h15peXI91mnq96foMB5vLtQIZdnLqDNzC 7oYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:to:subject :message-id:date:mime-version:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=4YBmC/TX7MM65vmiZTB6c8H9+1vFO3YlniLK+5fW2tg=; b=BQ5PD9Ze1UffhYlbN1E2pPp82fGUk3voiXxDRMG/ykKphOYs6bfUp8rM252FrG/04i GLvSCT2aM4EEc6OnOdzQh4W4YUgJC6pAnH8Wpeu3qD0mZ7sQ1t/lP9m0T8C1rYts1Vzn 0GyNt6qQYSsij16Tf94nj2okpLaUxqTv20LlCnIPlCHHJnmvEj01huJEm77LyrVJWmEw NPMK2re4QQkmed30+wIGjJjxVWy/+M7X1scqyAhuoB1RXrxvAquzQNdiI+5HAZ0LVu8c GYJY380ThBjbV4SX7gkCCJrKita034LlUbKy5EWaqqhQTqSxcErcEwlim3UbBQDn7icM 2SlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=p6auBDTC; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ne39-20020a1709077ba700b00947410648ddsi2268028ejc.172.2023.04.07.14.08.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 14:08:40 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=p6auBDTC; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6624B38582BD for ; Fri, 7 Apr 2023 21:08:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6624B38582BD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1680901719; bh=4YBmC/TX7MM65vmiZTB6c8H9+1vFO3YlniLK+5fW2tg=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=p6auBDTC+6BwZnz4Y1Y+wO+/+a4JE6LgskvnDSzOU/OgQ1+BrBXXHKbBqduMl7VXR +vRHo0UAzaxVQ8vmsXVY/FsLhPQg2P9CgHSBVNdoFV1Pe6zEeMyzjU/rTisGyGrA77 R1W4gJmkKpDkyJrR/hhKNjqcCEbeqwZTrfVP5rUU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by sourceware.org (Postfix) with ESMTPS id 71B8C3858D32 for ; Fri, 7 Apr 2023 21:07:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 71B8C3858D32 Received: by mail-pj1-x1031.google.com with SMTP id g3so545063pja.2 for ; Fri, 07 Apr 2023 14:07:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680901674; x=1683493674; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4YBmC/TX7MM65vmiZTB6c8H9+1vFO3YlniLK+5fW2tg=; b=UAZMdCGFDpv1rBulWqpYMAuekYA5+EAg/1DKPTogbAcbBpvkCzv6ogDcdXDJq4y97K qP4sPElCjpOBHh3oRRVWJjfawzPDJPINcqvA1L720QAi0M9WRAfb0MVLGPEHnvpm1c7V fCIv1y8n0ufnaAfDsv41lqgy1mKBadTBF/x/l+sFw/4ZzjVhI3yqkjtiXgFS7XwoTLKS 8kZzqqjujHXF9ep3pDdrSr+QORt0hnq9c79P6u9ShY6bTdnXrCjWVD2PeAKN6RBWqzrY rGOr/scuhenqVf28y0ASY2bI7FEpt5vccEjvbqHob6uNhvQZa4r+W81eYztbq2FGVIIK 3a2Q== X-Gm-Message-State: AAQBX9f3tOmEsXX6tU9VVrtMRu3/wlLD86kpqHajnKoayRIINeXEfKxq DCFn1cIsdW4tVEblEN08vaJNjhlscN276Bfsm4Io9YO7qxbuzmNYRAw= X-Received: by 2002:a17:902:7d97:b0:19f:1ee9:a1b with SMTP id a23-20020a1709027d9700b0019f1ee90a1bmr1314897plm.4.1680901674039; Fri, 07 Apr 2023 14:07:54 -0700 (PDT) MIME-Version: 1.0 Date: Fri, 7 Apr 2023 14:07:42 -0700 Message-ID: Subject: libgo patch committed: Remove test ordering dependency in mime To: gcc-patches , gofrontend-dev X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ian Lance Taylor via Gcc-patches From: Ian Lance Taylor Reply-To: Ian Lance Taylor Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762553203068811759?= X-GMAIL-MSGID: =?utf-8?q?1762553203068811759?= This libgo patch removes a test ordering dependency in the mime package. This is a backport of https://go.dev/cl/421442 from the upstream repo. This fixes https://go.dev/issue/51648. Bootstrapped and ran mime tests on x86_64-pc-linux-gnu. Committed to mainline. Ian f22c12d7361d22d47cce73d342edf2e1ebf20520 diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index addef6f8f51..e133650ad91 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -63ba7dd52f2cc49dab4b70ac81309296a920d4dc +0411a2733fd468e69f1998edd91e8fe3ba40ff9e The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/mime/type_test.go b/libgo/go/mime/type_test.go index 5e4d25cc872..5769c6a55de 100644 --- a/libgo/go/mime/type_test.go +++ b/libgo/go/mime/type_test.go @@ -14,7 +14,10 @@ import ( func setMimeInit(fn func()) (cleanup func()) { once = sync.Once{} testInitMime = fn - return func() { testInitMime = nil } + return func() { + testInitMime = nil + once = sync.Once{} + } } func clearMimeTypes() { diff --git a/libgo/go/mime/type_unix_test.go b/libgo/go/mime/type_unix_test.go index 4d109aa71a2..43db44b7aa1 100644 --- a/libgo/go/mime/type_unix_test.go +++ b/libgo/go/mime/type_unix_test.go @@ -11,6 +11,7 @@ import ( ) func initMimeUnixTest(t *testing.T) { + once.Do(initMime) err := loadMimeGlobsFile("testdata/test.types.globs2") if err != nil { t.Fatal(err)