From patchwork Wed Feb 27 01:11:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 1048626 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-497087-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=golang.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="J1epxGIp"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=golang-org.20150623.gappssmtp.com header.i=@golang-org.20150623.gappssmtp.com header.b="rF2d1Zzb"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 448HhY43bMz9s7T for ; Wed, 27 Feb 2019 12:11:51 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:from:date:message-id:subject:to:content-type; q= dns; s=default; b=bDx+NnzHdWH8Z38cKJq81uTw48wsYffVEslpbjNeOJncSd MQ8KN7MRiRQC+O1+i9HlG+012W9G+jEs92aYmxJiSgYKVY5xAToStYmH7HV2GMoF o6NfR4VXPo5mDXXj5iybyxx2gfeGurK9N1zK43QvZeM/05I/eJfcMgM+9ELCM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:from:date:message-id:subject:to:content-type; s= default; bh=k0/dpHIyIbgXJchJt7uTYyAUkx8=; b=J1epxGIpstWGg6QHFujd p+XZQBbgIypTCzDmT90PGl3FDOImI2VIj+dN0J1Mvrgw8TLOabbPDgp+E0sNGzCL e1drrR0udaSdnzgqYCbOTbD6DhR29xD7Iiz7jFtsy1oeTGl3e9kEjlxwQFxUBcld lSRqFjWl4mBF5kTU25G01b0= Received: (qmail 19768 invoked by alias); 27 Feb 2019 01:11:42 -0000 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 Received: (qmail 19565 invoked by uid 89); 27 Feb 2019 01:11:39 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=8313, act X-HELO: mail-lf1-f52.google.com Received: from mail-lf1-f52.google.com (HELO mail-lf1-f52.google.com) (209.85.167.52) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 27 Feb 2019 01:11:37 +0000 Received: by mail-lf1-f52.google.com with SMTP id e27so11153799lfj.8 for ; Tue, 26 Feb 2019 17:11:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=golang-org.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=vpafrydtKv+QaGd6fULwV5UGarGgqgTPgy6DRM4IXs0=; b=rF2d1Zzb5zCAcfDOn5Df03I+8q8XQ2SQgIU2hXnHhNYBZz0E5RjO2UcjPLqA0YxstB wIEbrZXZKKhAgxFlzUEpfCcmcRRdbT7m5DsQ9fnlPayzlXS0yf5Wqew5gPwvi3YNlxl1 wGmaq1Dd0svCQuAi0NJlvPEKtQfz071zudOXoOVi5impn6VQWC8zBU1tJisSUQfHD1tD 6yiTkq3598id3bNEvQv2M9cVINJKPgMBp6UGfcZazHMV9dL1vdOX31AABkmatXuBgDwi YwZJ0kuxfEvDvA5jlCZbnista2oGH/sT3f/gRvayoQLc4Krsulbf8k01k7Ebh4gGHai0 UzDA== MIME-Version: 1.0 From: Ian Lance Taylor Date: Tue, 26 Feb 2019 17:11:23 -0800 Message-ID: Subject: libgo patch committed: Preserve CC for TestScript child processes To: gcc-patches , gofrontend-dev This libgo patch fixes the cmd/g TestScript test to preserve the CC environment variable for TestScript child processes, so that tests that use cgo will act as expected. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian Index: gcc/go/gofrontend/MERGE =================================================================== --- gcc/go/gofrontend/MERGE (revision 269216) +++ gcc/go/gofrontend/MERGE (working copy) @@ -1,4 +1,4 @@ -558fcb7bf2a6b78bdba87f20a8a4a95d27125d74 +9c1859b8e97242b0e697a3aaa39a4da5e6172e74 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. Index: libgo/go/cmd/go/script_test.go =================================================================== --- libgo/go/cmd/go/script_test.go (revision 269196) +++ libgo/go/cmd/go/script_test.go (working copy) @@ -83,13 +83,12 @@ type backgroundCmd struct { } var extraEnvKeys = []string{ - "SYSTEMROOT", // must be preserved on Windows to find DLLs; golang.org/issue/25210 - "LD_LIBRARY_PATH", // must be preserved on Unix systems to find shared libraries - - // For gccgo testing. - "GO_TESTING_GOTOOLS", - "GCCGO", - "GCCGOTOOLDIR", + "SYSTEMROOT", // must be preserved on Windows to find DLLs; golang.org/issue/25210 + "LD_LIBRARY_PATH", // must be preserved on Unix systems to find shared libraries + "CC", // don't lose user settings when invoking cgo + "GO_TESTING_GOTOOLS", // for gccgo testing + "GCCGO", // for gccgo testing + "GCCGOTOOLDIR", // for gccgo testing } // setup sets up the test execution temporary directory and environment.