From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YPQOLtBFWGGxzgAAgWs5BA (envelope-from ) for ; Sat, 02 Oct 2021 13:43:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id QBiXKdBFWGEhOAAAbx9fmQ (envelope-from ) for ; Sat, 02 Oct 2021 11:43:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1DB9E2B7F8 for ; Sat, 2 Oct 2021 13:43:12 +0200 (CEST) Received: from localhost ([::1]:36212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWdQ7-0004yU-8M for larch@yhetil.org; Sat, 02 Oct 2021 07:43:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWdPy-0004vV-7S for guix-patches@gnu.org; Sat, 02 Oct 2021 07:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWdPx-0002Ux-VV for guix-patches@gnu.org; Sat, 02 Oct 2021 07:43:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWdPx-0007ws-TY for guix-patches@gnu.org; Sat, 02 Oct 2021 07:43:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 1/3] gnu: node: Avoid duplicating build phases. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Oct 2021 11:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Philip McGrath Cc: Pierre Langlois , 49946@debbugs.gnu.org, Maxime Devos Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.163317497630542 (code B ref 49946); Sat, 02 Oct 2021 11:43:01 +0000 Received: (at 49946) by debbugs.gnu.org; 2 Oct 2021 11:42:56 +0000 Received: from localhost ([127.0.0.1]:58103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWdPr-0007wV-Oh for submit@debbugs.gnu.org; Sat, 02 Oct 2021 07:42:56 -0400 Received: from mout.gmx.net ([212.227.17.20]:60267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWdPp-0007wH-SI for 49946@debbugs.gnu.org; Sat, 02 Oct 2021 07:42:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1633174967; bh=AdY6OF+zAhM3Pi3ldPTsX+mXGtdLEKEj6WvKZPg51ik=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=KCZu4IpVE1LLuOVxS3rtpy04VE7Sc6mKP2dBCgX8OwH4BStaSQzD3iiEewFo/+bzB Zq2aR10w88V6QboaOtfuPQeVLfojO0AJBQWt6ooRWgxv9qXJ47Cm4tNDxe0cCvGbCc qvmbSEOWgsYLochgNXUryUsVWke7hlc1oQcpBmmE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mn2aN-1nGizh31yp-00k5Ne; Sat, 02 Oct 2021 13:42:46 +0200 References: <682f2ed3-90bd-a9f8-1193-34bef399ca62@philipmcgrath.com> <87h7fztt60.fsf@gmx.com> <20210808233354.6745-1-pierre.langlois@gmx.com> <20210808233354.6745-8-pierre.langlois@gmx.com> <42e10baddb6afe308f67c3240bf5da8159e6f118.camel@telenet.be> <87o88gq5p5.fsf@gmx.com> <20210930225611.2143194-1-philip@philipmcgrath.com> <20210930225611.2143194-2-philip@philipmcgrath.com> User-agent: mu4e 1.6.6; emacs 27.2 From: Pierre Langlois Date: Sat, 02 Oct 2021 12:03:13 +0100 In-reply-to: <20210930225611.2143194-2-philip@philipmcgrath.com> Message-ID: <87h7dzveiy.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:QskucceKtb636UPXS2aL8CfHGfhztEv/1mlgJ4fi1ScPGadqvkH lj8HJO337QsVFWzLIcGCCNU88MvxtziLO07s/THR9W+C2qEPzwDAggOaIuKY4XVevwknm7B rJA6vXp3h49/bamy8I5IrfcOrDcPJbzNDkiF5/wRt0ZKqf10KORg7wrLrWgT0d/q9n5VSYS W7HH68S+UAKtI5fgJBqQA== X-UI-Out-Filterresults: notjunk:1;V03:K0:3ZUFcb9KeuY=:ua0PBDpvJSQawwJ5zKXXY3 o8A2Z2ZtOayaiyvyQ8uUZiqL83azaZ4bPqVJQtWGm8hMJw7pO6WG+dgj38yHXxEXBwpY80GDT X0p5xa8WC4EwIAcnpArD/B2PT72tAM89abSxxDN8pTKhVBIMzudRFeYBUThCIt7Q9+G2CP3ob IPImSmgIcIalooUZnCldFAlFX7MLlPnwJoGP/Jw3CRN8pgNM1ZPHgNbSG+CCPoDlZ9Gf49Q8i 9cc2I0ruoMEOjDw777qbtI41PHYAMuXxQTTp+T5taJq2OkJJP9v9ul9exiuqSjiWxOB/0eW7P eJeRlVdr+2DkxWfOqVdxptuyVtcsC+AGXP49eJGNId0GH5HEfNfklOl+K9ZqoX22F2x+W6lgI BtH748CA1GBn05/Fva+JDU2I6QZDBa7z3+3129GDwx2BojUHv7Ud2rL6lJ0EQCbPWWeUDbmV8 PUhnv9rOcqyQzLygu+rGjysFWnb3EAO25lQEzrnpkYpg7+ykCeRmcONWfdizUvS+UC9zl/GfF HGLMJOCpt1767gjEmrR8gaHChrQlIwFWDTwE+5Q6axS4qJu1kzwHQgb3GEWIBh9jEbCq6wSon Q8ZbaQd5+bWKGSiNgLbYClkNYNpxcFF1zo3WBcLcv6Eps++979KTylDS7HvZeIoLgbmATnNrQ uC3pnny1TMXGcVI1JK3ht9OvwU8XAbRHygt22GG9x2RtRXxuHVsvJCgx0tHQXd8mTGtLfJOTG JVXCD/eZJVY/BqHcRGkV73nHKum6bD25TZttrbYvzNH69TGQ052TNLpdC9po0lAoZalm09XuB 5sdJ4BqPEi0oa+lsXppV5JVIwhFYTt7nVwNbrqMoPYInR3GhEi3CDCsyxKCW6Zay89dZWgNwr O6x9h+sJwttTJNmItajGfx/fJi4S7/eZwFJYauoo0LNEhFwQ9T0NoEJh4lxueKj4/b7ZDLrCm Kas3XN87l8cvgS/8gV43Ybgg6r0cuzsRZWDua0A2prP2fSDsvC0yvdO/YIM9LoGuhpiWqhUeF R43DPAJ6uzKfhDIrViY1JslMNKDTc1hcrXiQevtSIhs/jYBL2YXn/72F0w1tAiwA6M5dr6Uco VUwk6L4FPNjPj4= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633174992; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=plCwrh0p63EAN0QzsQIQ0JUX9VucZDHHbmLk9Up/UAE=; b=qqoxh7g1psQE+qL6XiZoH4ahGCGD4wjlSWnKq+xHOJrfhj84KgWfhrL9RpGKgfunoLD4ec SuO23S2wi/Z3Z4rCNdukigf3r6+2UkqxZdPXBlCmLpG5v+ESmLVhGxvSasfLcWRofGcdB2 R1Wv1ovIsLNbyx7ZnDVhDbIxkjhHluWteV3LvPOuWFZ56bYd5rt9bGufa7eiTqh5MgWrW+ d/zJDrFbCJoIYJQ3AV1M13gtzOUuXZmtlQc6Tn4YtCb6vbvENoZl+tekojLKmGYDqfF2U8 lo1qjbltGiZiwt+FN5q9xR2nbdZBRBc6JuYsgdDGW+6pw2RFa0uPLJGlpGtxmA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633174992; a=rsa-sha256; cv=none; b=a9G8yBJaGBhxUVIeTELSM9DR3STBPqQeD8OJNPbyc6OHXudCnD2zP4pD3f/SnPPaeW2Jhe uC7c37Ag4ZceTjQcwVJU3yoUdijFuxosvITDescSFRYPfttoI4WS52iVGhoE0OjNG6dtsa rOcXfIPO1rxyx/pBqQE1uUvnK5Z7Qa++Kgv8jVIy2XWiBp0pYkBy+Db+BRPnJx1XfbcTG2 m5yPKQNfK41dGQ5uZ8mTU+tlzbmageo5heiJB5Lqxv74bhYnKYRA5fNqcWFTwAMEhLFnOO 7SQWYhOv7WgKAmvhvVSm2HNTSDJzbMJ9nNBAeNHeD9AZQ+8ZmTT1a7aqJz38hg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=KCZu4IpV; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -3.81 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=KCZu4IpV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 1DB9E2B7F8 X-Spam-Score: -3.81 X-Migadu-Scanner: scn1.migadu.com X-TUID: doeJHUuoLIYb --=-=-= Content-Type: text/plain Hi Philip, Philip McGrath writes: > * gnu/packages/node.scm (node)[arguments]: Split 'patch-files phase > into 'patch-hardcoded-program-references and > 'delete-problematic-tests. Adapt those phases and 'configure to work > unmodified on node-lts. > (node, node-lts)[inputs]: Use bash-minimal rather than bash. > (node-lts)[arguments]: Inherit 'patch-hardcoded-program-references, > 'delete-problemating-tests, and 'configure phases from the bootstrap > node. Remove the 'patch-files phase, keeping its remaining > non-inherited work in a new 'replace-llhttp-sources phase. While I agree that most of the time, factoring out common code is a good thing, I'm not sure it applies in the case of patching tests. The list of tests is specific to a version and it's likely for each version to need fixes. Having a common phase that describes the tests to patch for 2 versions (3 if we add node 16) is harder to maintain than three phases IMO, even though they'll look similar indeed. Having to change commmon code can also cause unnessecary rebuilds. For example, I started working updating node last weekend and saw these test changes: - 14.16 -> 14.17: Delete test/parallel/test-https-agent-unref-socket.js, requires networking - 16: Extra test needs /bin/sh patched test/parallel/test-stdin-from-file-spawn.js" A couple tests were renamed: test/parallel/test-cluster-master-error.js -> test/parallel/test-cluster-primary-error.js test/parallel/test-cluster-master-kill.js -> test/parallel/test-cluster-primary-kill.js That being said, I definetely agree we should have a separate phase for the replacement of the llhttp source, that's logically different from patching tests, and is unlikely to change version to version. Keeping the list of tests local to each packages allows to add node 16 while avoiding rebuilding the others, does this make sense? I could be wrong here of course :-). Thanks, Pierre --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmFYRbUYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UzrcH/i7cT2CBqJuJMKem8JeCTV0g Z1jWeCdY1zYvmulsczCn/35nIwFi+n+YBePIoxn9pfyl6FfrMXskMavafWUSk8K2 El5QB0ITYyWQ3w7R87GIonaMxc7Yqsy/SteTe3gqLPPQCO4N3kcx4viiigLK9wGF Q8xSWrZZlsEQat7E/z3ID0uW1AQ3Usyk+GqjEYknJQOTyutN5T1LjwMHIrICftxr aUZ6kKxRCBLy23kprbneZykV3DHsLwvl96gGBD2XK+rKuHjvhmHl41Sqh49xms92 dVtlA7AMR/ZPrWOvvjD8oPOi610sw8HhpuNjmrv8bE0ub7Q8dL9UEqEDQkzzz4I= =S0Pr -----END PGP SIGNATURE----- --=-=-=--