From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 31 13:46:41 2021 Received: (at submit) by debbugs.gnu.org; 31 Jan 2021 18:46:41 +0000 Received: from localhost ([127.0.0.1]:58002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Hk7-0002tF-NR for submit@debbugs.gnu.org; Sun, 31 Jan 2021 13:46:41 -0500 Received: from lists.gnu.org ([209.51.188.17]:37836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Hk2-0002sy-UJ for submit@debbugs.gnu.org; Sun, 31 Jan 2021 13:46:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6Hjw-0002nG-Mq for guix-patches@gnu.org; Sun, 31 Jan 2021 13:46:33 -0500 Received: from andre.telenet-ops.be ([2a02:1800:120:4::f00:15]:57938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6Hjs-00082o-1r for guix-patches@gnu.org; Sun, 31 Jan 2021 13:46:28 -0500 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id PWmJ2400Q0mfAB401WmKXU; Sun, 31 Jan 2021 19:46:19 +0100 Message-ID: Subject: [PATCH] Remove duplication in tests/publish.scm From: Maxime Devos To: guix-patches@gnu.org Date: Sun, 31 Jan 2021 19:46:02 +0100 Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-JTrRzX0XsiVNcg5qCziF" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1612118779; bh=X/vcDMDJqexGVsFLSII85EA0kwlG48Cr4VVGiBwICQw=; h=Subject:From:To:Date; b=H4zvKzTjAdCQBOAsB9hnUwItIyifPgGvKQm8IDruwgkcmHgkfE6ywQe5FWDvzdW9k a7ib8Dby7EiJ12ruKB+xHtjlEVAw2a+rCQVbvDnYYubeFZPkClHt3/itj7pKsfrim0 fOa7WYgvuB8Dd5SOP/gOU0/s3eYavY917AuHOYZuhs0R2nWGGFZvUTVabOGOsdYmD9 WraiinsJQf81XhHl6NIATlBjYjGPJwqPTgIAt23wl0CjgfK0M2GHULXAm7lEnaHUK4 VAPp5jQ5oQt1T7+sbyqBmRJsNoOvuuSKNK4z3sJeqekAJyvnqMdx8AnRE49YGs1V9e EBXwkB/l8X9Wg== Received-SPF: pass client-ip=2a02:1800:120:4::f00:15; envelope-from=maximedevos@telenet.be; helo=andre.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-JTrRzX0XsiVNcg5qCziF Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Guix! In https://issues.guix.gnu.org/46214, I proposed a draft patch for adding a =E2=80=98hook=E2=80=99 mechanism to guix publish. Now I would like to write some tests. However, it seems the following construct is duplicated for many tests: (call-with-new-thread (lambda () (guix-publish "--port=3DPORT" et cetera))) =09 This patch series introduces some abstraction. Currently, there is only one patch yet, but more will follow. "make check TESTS=3Dtests/publish.scm" still succeeds. (Guix version: 23a5dcce1d893b8f5c5301ae3c1af863776ed3cf with some not-yet-upstreamed changes). Maxime --=20 Maxime Devos PGP Key: C1F3 3EE2 0C52 8FDB 7DD7 011F 49E3 EE22 1917 25EE Freenode handle: mdevos --=-JTrRzX0XsiVNcg5qCziF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYIADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYBb66hccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7pEWAQD9nLiw29CIsTc4KpAlUfMIrGoq 7fYpZuZEH5H1eAm/eAEA11ZWWSiTWnnEQFtmiQ/8zh6XASBR3A6KWAQjgJt+qwY= =mRp0 -----END PGP SIGNATURE----- --=-JTrRzX0XsiVNcg5qCziF-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 31 13:52:23 2021 Received: (at 46216) by debbugs.gnu.org; 31 Jan 2021 18:52:23 +0000 Received: from localhost ([127.0.0.1]:58022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Hpe-000328-O4 for submit@debbugs.gnu.org; Sun, 31 Jan 2021 13:52:23 -0500 Received: from andre.telenet-ops.be ([195.130.132.53]:34412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Hpc-00031y-9h for 46216@debbugs.gnu.org; Sun, 31 Jan 2021 13:52:21 -0500 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id PWsJ240050mfAB401WsJaB; Sun, 31 Jan 2021 19:52:18 +0100 Message-ID: <1aba271c99c375ff9a308f350c0bd0802ee49f3e.camel@telenet.be> Subject: Re: [PATCH] Remove duplication in tests/publish.scm From: Maxime Devos To: 46216@debbugs.gnu.org, maximedevos@telenet.be Date: Sun, 31 Jan 2021 19:52:18 +0100 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-OTlqsF/mW/i5c/rFfpnL" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1612119138; bh=05uplpnCaKARgwRZXznqY+i4rBJ0WuOxrx9tUIYKa1Q=; h=Subject:From:Reply-To:To:Date:In-Reply-To:References; b=T0u8mj7cCf5Ow7EO2S+15BnhMUfgClVyVVjcnK6ansWlrjnX+b6ifnqHk42kA5gOU EsZk/oDCkLGNBgmFvbR+SrpiS4VHo2Fnvx06s9tviHODglIB90Gj20NUUYajj0aFmY pLqT4eOtmwZhEr678jQVRbYvWXj2d+Wah+x/+5FOhdXVieif4rtH2DKLv3xf9Fmpj9 p68SVlfQ6iqodPgbx8+BotpJBB6oy3lYP7hWM9bPXZRDpYETZPo73mWOqztPYdAwnF 3j6EslZm4xgUP5fVVCTiXG7QQAZRJ9B7+zRalxPiEMFLo+BeC5Jqgn2VChQsH1h9cR hbtPtx7dAdw1A== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 46216 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 46216@debbugs.gnu.org, Maxime Devos Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-OTlqsF/mW/i5c/rFfpnL Content-Type: multipart/mixed; boundary="=-JA2BuOznOjtf9Vb3ouCF" --=-JA2BuOznOjtf9Vb3ouCF Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Oops, I forgot to attach the patch. --=-JA2BuOznOjtf9Vb3ouCF Content-Disposition: attachment; filename="0001-tests-publish-lessen-code-duplication.patch" Content-Type: text/x-patch; name="0001-tests-publish-lessen-code-duplication.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBkZTJhNTE0Mzc0ODJjNGE2YWE4MTI4NzJmMTU4MDQ4MDM2NTBjMTI4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFN1biwgMzEgSmFuIDIwMjEgMTk6NDg6MTQgKzAxMDAKU3ViamVjdDogW1BBVENIXSB0 ZXN0czogcHVibGlzaDogbGVzc2VuIGNvZGUgZHVwbGljYXRpb24uCgoqIHRlc3RzL3B1Ymxpc2gu c2NtIChzcGF3bi1ndWl4LXB1Ymxpc2gpOiBpbnRyb2R1Y2UKICBwcm9jZWR1cmUsIGFuZCBhZGp1 c3QgdGVzdHMgdG8gdXNlIGl0IGluc3RlYWQgb2YKICB1c2luZyBhbiBpbmxpbmUgZGVmaW5pdGlv bi4KLS0tCiB0ZXN0cy9wdWJsaXNoLnNjbSB8IDgyICsrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKSwg NDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdGVzdHMvcHVibGlzaC5zY20gYi90ZXN0cy9w dWJsaXNoLnNjbQppbmRleCA1MjEwMTg3NmI1Li43YzkwMzMyYmRhIDEwMDY0NAotLS0gYS90ZXN0 cy9wdWJsaXNoLnNjbQorKysgYi90ZXN0cy9wdWJsaXNoLnNjbQpAQCAtMiw2ICsyLDcgQEAKIDs7 OyBDb3B5cmlnaHQgwqkgMjAxNSBEYXZpZCBUaG9tcHNvbiA8ZGF2ZXRAZ251Lm9yZz4KIDs7OyBD b3B5cmlnaHQgwqkgMjAyMCBieSBBbWFyIE0uIFNpbmdoIDxubHlAZGlzcm9vdC5vcmc+CiA7Ozsg Q29weXJpZ2h0IMKpIDIwMTYsIDIwMTcsIDIwMTgsIDIwMTksIDIwMjAgTHVkb3ZpYyBDb3VydMOo cyA8bHVkb0BnbnUub3JnPgorOzs7IENvcHlyaWdodCDCqSAyMDIxIE1heGltZSBEZXZvcyA8bWF4 aW1lZGV2b3NAdGVsZW5ldC5iZT4KIDs7OwogOzs7IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBH dWl4LgogOzs7CkBAIC05MiwxMSArOTMsMjAgQEAKICAgICAgICAgKGxhbWJkYSAoKQogICAgICAg ICAgIGV4cCAuLi4pKSkpKQogCi07OyBSdW4gYSBsb2NhbCBwdWJsaXNoaW5nIHNlcnZlciBpbiBh IHNlcGFyYXRlIHRocmVhZC4KLSh3aXRoLXNlcGFyYXRlLW91dHB1dC1wb3J0cwotIChjYWxsLXdp dGgtbmV3LXRocmVhZAotICAobGFtYmRhICgpCi0gICAgKGd1aXgtcHVibGlzaCAiLS1wb3J0PTY3 ODkiICItQzAiKSkpKSAgICAgO2F0dGVtcHQgdG8gYXZvaWQgcG9ydCBjb2xsaXNpb24KKzs7IFJ1 biBsb2NhbCBwdWJsaXNoaW5nIHNlcnZlcnMgaW4gYSBzZXBhcmF0ZSB0aHJlYWQuCis7OyBBdHRl bXB0IHRvIGF2b2lkIHBvcnQgY29sbGlzaW9uIGJ5IGNob29zaW5nIHBvcnRzCis7OyB1bmxpa2Vs eSB0byBiZSB1c2VkIGluIHRoZSB3aWxkICg2Nzg5IGFuZCBoaWdoZXIpCisoZGVmaW5lIChzcGF3 bi1ndWl4LXB1Ymxpc2ggcG9ydCAuIGV4dHJhLWFyZ3VtZW50cykKKyAgIlJ1biBhIGxvY2FsIHB1 Ymxpc2hpbmcgc2VydmVyIGluIGEgc2VwYXJhdGUgdGhyZWFkLgorVGhlIHNlcnZlciB3aWxsIGxp c3RlbiBhdCBQT1JULiAgRVhUUkEtQVJHVU1FTlRTIGFyZQorcGFzc2VkIGFzLWlzIGFzIGV4dHJh IGNvbW1hbmQtbGluZSBhcmd1bWVudHMuCitUaGUgcmVzdWx0aW5nIHRocmVhZCBpcyByZXR1cm5l ZC4iCisgICh3aXRoLXNlcGFyYXRlLW91dHB1dC1wb3J0cworICAgKGNhbGwtd2l0aC1uZXctdGhy ZWFkCisgICAgKGxhbWJkYSAoKQorICAgICAgKGFwcGx5IGd1aXgtcHVibGlzaCAoZm9ybWF0ICNm ICItLXBvcnQ9fmEiIHBvcnQpIGV4dHJhLWFyZ3VtZW50cykpKSkpCisKKyhzcGF3bi1ndWl4LXB1 Ymxpc2ggNjc4OSAiLUMwIikKIAogKGRlZmluZSAod2FpdC11bnRpbC1yZWFkeSBwb3J0KQogICA7 OyBXYWl0IHVudGlsIHRoZSBzZXJ2ZXIgaXMgYWNjZXB0aW5nIGNvbm5lY3Rpb25zLgpAQCAtMjU3 LDEwICsyNjcsNyBAQCBSZWZlcmVuY2VzOiB+JSIKICAgYCgoIlN0b3JlUGF0aCIgLiAsJWl0ZW0p CiAgICAgKCJVUkwiIC4gLChzdHJpbmctYXBwZW5kICJuYXIvZ3ppcC8iIChiYXNlbmFtZSAlaXRl bSkpKQogICAgICgiQ29tcHJlc3Npb24iIC4gImd6aXAiKSkKLSAgKGxldCAoKHRocmVhZCAod2l0 aC1zZXBhcmF0ZS1vdXRwdXQtcG9ydHMKLSAgICAgICAgICAgICAgICAgKGNhbGwtd2l0aC1uZXct dGhyZWFkCi0gICAgICAgICAgICAgICAgICAobGFtYmRhICgpCi0gICAgICAgICAgICAgICAgICAg IChndWl4LXB1Ymxpc2ggIi0tcG9ydD02Nzk5IiAiLUM1IikpKSkpKQorICAobGV0ICgodGhyZWFk IChzcGF3bi1ndWl4LXB1Ymxpc2ggNjc5OSAiLUM1IikpKQogICAgICh3YWl0LXVudGlsLXJlYWR5 IDY3OTkpCiAgICAgKGxldCogKCh1cmwgIChzdHJpbmctYXBwZW5kICJodHRwOi8vbG9jYWxob3N0 OjY3OTkvIgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RvcmUtcGF0aC1oYXNo LXBhcnQgJWl0ZW0pICIubmFyaW5mbyIpKQpAQCAtMjc3LDEwICsyODQsNyBAQCBSZWZlcmVuY2Vz OiB+JSIKICAgYCgoIlN0b3JlUGF0aCIgLiAsJWl0ZW0pCiAgICAgKCJVUkwiIC4gLChzdHJpbmct YXBwZW5kICJuYXIvbHppcC8iIChiYXNlbmFtZSAlaXRlbSkpKQogICAgICgiQ29tcHJlc3Npb24i IC4gImx6aXAiKSkKLSAgKGxldCAoKHRocmVhZCAod2l0aC1zZXBhcmF0ZS1vdXRwdXQtcG9ydHMK LSAgICAgICAgICAgICAgICAgKGNhbGwtd2l0aC1uZXctdGhyZWFkCi0gICAgICAgICAgICAgICAg ICAobGFtYmRhICgpCi0gICAgICAgICAgICAgICAgICAgIChndWl4LXB1Ymxpc2ggIi0tcG9ydD02 NzkwIiAiLUNsemlwIikpKSkpKQorICAobGV0ICgodGhyZWFkIChzcGF3bi1ndWl4LXB1Ymxpc2gg Njc5MCAiLUNsemlwIikpKQogICAgICh3YWl0LXVudGlsLXJlYWR5IDY3OTApCiAgICAgKGxldCog KCh1cmwgIChzdHJpbmctYXBwZW5kICJodHRwOi8vbG9jYWxob3N0OjY3OTAvIgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAoc3RvcmUtcGF0aC1oYXNoLXBhcnQgJWl0ZW0pICIubmFy aW5mbyIpKQpAQCAtMzE1LDEwICszMTksNyBAQCBSZWZlcmVuY2VzOiB+JSIKICAgICAyMDApCiAg IChjYWxsLXdpdGgtdGVtcG9yYXJ5LWRpcmVjdG9yeQogICAgKGxhbWJkYSAoY2FjaGUpCi0gICAg IChsZXQgKCh0aHJlYWQgKHdpdGgtc2VwYXJhdGUtb3V0cHV0LXBvcnRzCi0gICAgICAgICAgICAg ICAgICAgIChjYWxsLXdpdGgtbmV3LXRocmVhZAotICAgICAgICAgICAgICAgICAgICAgKGxhbWJk YSAoKQotICAgICAgICAgICAgICAgICAgICAgICAoZ3VpeC1wdWJsaXNoICItLXBvcnQ9Njc5MyIg Ii1DZ3ppcDoyIiAiLUNsemlwOjIiKSkpKSkpCisgICAgIChsZXQgKCh0aHJlYWQgKHNwYXduLWd1 aXgtcHVibGlzaCA2NzkzICItQ2d6aXA6MiIgIi1DbHppcDoyIikpKQogICAgICAgICh3YWl0LXVu dGlsLXJlYWR5IDY3OTMpCiAgICAgICAgKGxldCogKChiYXNlICJodHRwOi8vbG9jYWxob3N0OjY3 OTMvIikKICAgICAgICAgICAgICAgKHBhcnQgKHN0b3JlLXBhdGgtaGFzaC1wYXJ0ICVpdGVtKSkK QEAgLTMzOSwxMSArMzQwLDggQEAgUmVmZXJlbmNlczogfiUiCiAgICAgICAgICAgKCJDb21wcmVz c2lvbiIgLiAibm9uZSIpKQogICAgICAgICAyMDAKICAgICAgICAgNDA0KQotICAobGV0ICgodGhy ZWFkICh3aXRoLXNlcGFyYXRlLW91dHB1dC1wb3J0cwotICAgICAgICAgICAgICAgICAoY2FsbC13 aXRoLW5ldy10aHJlYWQKLSAgICAgICAgICAgICAgICAgIChsYW1iZGEgKCkKLSAgICAgICAgICAg ICAgICAgICAgKGd1aXgtcHVibGlzaCAiLS1wb3J0PTY3OTgiICItQzAiCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIi0tbmFyLXBhdGg9Ly8vZm9vL2Jhci8vY2hib3VpYi8iKSkp KSkpCisgIChsZXQgKCh0aHJlYWQgKHNwYXduLWd1aXgtcHVibGlzaCA2Nzk4ICItQzAiCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1uYXItcGF0aD0vLy9mb28vYmFyLy9j aGJvdWliLyIpKSkKICAgICAod2FpdC11bnRpbC1yZWFkeSA2Nzk4KQogICAgIChsZXQqICgoYmFz ZSAgICAiaHR0cDovL2xvY2FsaG9zdDo2Nzk4LyIpCiAgICAgICAgICAgIChwYXJ0ICAgIChzdG9y ZS1wYXRoLWhhc2gtcGFydCAlaXRlbSkpCkBAIC00MjUsMTIgKzQyMyw5IEBAIFJlZmVyZW5jZXM6 IH4lIgogICAgICAgICA0MDQpICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7 bmFyL+KApgogICAoY2FsbC13aXRoLXRlbXBvcmFyeS1kaXJlY3RvcnkKICAgIChsYW1iZGEgKGNh Y2hlKQotICAgICAobGV0ICgodGhyZWFkICh3aXRoLXNlcGFyYXRlLW91dHB1dC1wb3J0cwotICAg ICAgICAgICAgICAgICAgICAoY2FsbC13aXRoLW5ldy10aHJlYWQKLSAgICAgICAgICAgICAgICAg ICAgIChsYW1iZGEgKCkKLSAgICAgICAgICAgICAgICAgICAgICAgKGd1aXgtcHVibGlzaCAiLS1w b3J0PTY3OTciICItQzIiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0 cmluZy1hcHBlbmQgIi0tY2FjaGU9IiBjYWNoZSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAiLS1jYWNoZS1ieXBhc3MtdGhyZXNob2xkPTAiKSkpKSkpCisgICAgIChsZXQg KCh0aHJlYWQgKHNwYXduLWd1aXgtcHVibGlzaCA2Nzk3ICItQzIiCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiLS1jYWNoZT0iIGNhY2hlKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tY2FjaGUtYnlwYXNzLXRo cmVzaG9sZD0wIikpKQogICAgICAgICh3YWl0LXVudGlsLXJlYWR5IDY3OTcpCiAgICAgICAgKGxl dCogKChiYXNlICAgICAiaHR0cDovL2xvY2FsaG9zdDo2Nzk3LyIpCiAgICAgICAgICAgICAgIChw YXJ0ICAgICAoc3RvcmUtcGF0aC1oYXNoLXBhcnQgJWl0ZW0pKQpAQCAtNDgwLDEyICs0NzUsOSBA QCBSZWZlcmVuY2VzOiB+JSIKICAgJygyMDAgMjAwIDQwNCkKICAgKGNhbGwtd2l0aC10ZW1wb3Jh cnktZGlyZWN0b3J5CiAgICAobGFtYmRhIChjYWNoZSkKLSAgICAgKGxldCAoKHRocmVhZCAod2l0 aC1zZXBhcmF0ZS1vdXRwdXQtcG9ydHMKLSAgICAgICAgICAgICAgICAgICAgKGNhbGwtd2l0aC1u ZXctdGhyZWFkCi0gICAgICAgICAgICAgICAgICAgICAobGFtYmRhICgpCi0gICAgICAgICAgICAg ICAgICAgICAgIChndWl4LXB1Ymxpc2ggIi0tcG9ydD02Nzk0IiAiLUNnemlwOjIiICItQ2x6aXA6 MiIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAi LS1jYWNoZT0iIGNhY2hlKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIt LWNhY2hlLWJ5cGFzcy10aHJlc2hvbGQ9MCIpKSkpKSkKKyAgICAgKGxldCAoKHRocmVhZCAoc3Bh d24tZ3VpeC1wdWJsaXNoIDY3OTQgIi1DZ3ppcDoyIiAiLUNsemlwOjIiCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiLS1jYWNoZT0iIGNhY2hl KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tY2FjaGUtYnlwYXNz LXRocmVzaG9sZD0wIikpKQogICAgICAgICh3YWl0LXVudGlsLXJlYWR5IDY3OTQpCiAgICAgICAg KGxldCogKChiYXNlICAgICAiaHR0cDovL2xvY2FsaG9zdDo2Nzk0LyIpCiAgICAgICAgICAgICAg IChwYXJ0ICAgICAoc3RvcmUtcGF0aC1oYXNoLXBhcnQgJWl0ZW0pKQpAQCAtNTg4LDExICs1ODAs OCBAQCBSZWZlcmVuY2VzOiB+JSIKICAgMjAwCiAgIChjYWxsLXdpdGgtdGVtcG9yYXJ5LWRpcmVj dG9yeQogICAgKGxhbWJkYSAoY2FjaGUpCi0gICAgIChsZXQgKCh0aHJlYWQgKHdpdGgtc2VwYXJh dGUtb3V0cHV0LXBvcnRzCi0gICAgICAgICAgICAgICAgICAgIChjYWxsLXdpdGgtbmV3LXRocmVh ZAotICAgICAgICAgICAgICAgICAgICAgKGxhbWJkYSAoKQotICAgICAgICAgICAgICAgICAgICAg ICAoZ3VpeC1wdWJsaXNoICItLXBvcnQ9Njc5NSIKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiLS1jYWNoZT0iIGNhY2hlKSkpKSkpKQorICAgICAo bGV0ICgodGhyZWFkIChzcGF3bi1ndWl4LXB1Ymxpc2ggNjc5NQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgIi0tY2FjaGU9IiBjYWNoZSkpKSkK ICAgICAgICAod2FpdC11bnRpbC1yZWFkeSA2Nzk1KQogCiAgICAgICAgOzsgTWFrZSBzdXJlIHRo YXQsIGV2ZW4gaWYgSVRFTSBkaXNhcHBlYXJzLCB3ZSdyZSBzdGlsbCBhYmxlIHRvIGZldGNoCkBA IC02MTUsMTEgKzYwNCw5IEBAIFJlZmVyZW5jZXM6IH4lIgogICAyMDAKICAgKGNhbGwtd2l0aC10 ZW1wb3JhcnktZGlyZWN0b3J5CiAgICAobGFtYmRhIChjYWNoZSkKLSAgICAgKGxldCAoKHRocmVh ZCAod2l0aC1zZXBhcmF0ZS1vdXRwdXQtcG9ydHMKLSAgICAgICAgICAgICAgICAgICAgKGNhbGwt d2l0aC1uZXctdGhyZWFkCi0gICAgICAgICAgICAgICAgICAgICAobGFtYmRhICgpCi0gICAgICAg ICAgICAgICAgICAgICAgIChndWl4LXB1Ymxpc2ggIi0tcG9ydD02Nzg4IiAiLUMiICJnemlwIgot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICItLWNh Y2hlPSIgY2FjaGUpKSkpKSkpCisgICAgIChsZXQgKCh0aHJlYWQgKHNwYXduLWd1aXgtcHVibGlz aCA2Nzg4ICItQyIgImd6aXAiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiLS1wb3J0PTY3ODgiICItQyIgImd6aXAiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiLS1jYWNoZT0iIGNhY2hlKSkpKQogICAgICAgICh3 YWl0LXVudGlsLXJlYWR5IDY3ODgpCiAKICAgICAgICAobGV0KiAoKGJhc2UgICAgICJodHRwOi8v bG9jYWxob3N0OjY3ODgvIikKQEAgLTY1MSwxMSArNjM4LDggQEAgUmVmZXJlbmNlczogfiUiCiAg IDs7IGZvciBhIG5vbi1leGlzdGluZyBmaWxlIG5hbWUuCiAgIChjYWxsLXdpdGgtdGVtcG9yYXJ5 LWRpcmVjdG9yeQogICAgKGxhbWJkYSAoY2FjaGUpCi0gICAgIChsZXQgKCh0aHJlYWQgKHdpdGgt c2VwYXJhdGUtb3V0cHV0LXBvcnRzCi0gICAgICAgICAgICAgICAgICAgIChjYWxsLXdpdGgtbmV3 LXRocmVhZAotICAgICAgICAgICAgICAgICAgICAgKGxhbWJkYSAoKQotICAgICAgICAgICAgICAg ICAgICAgICAoZ3VpeC1wdWJsaXNoICItLXBvcnQ9Njc4NyIgIi1DIiAiZ3ppcCIKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiLS1jYWNoZT0iIGNh Y2hlKSkpKSkpKQorICAgICAobGV0ICgodGhyZWFkIChzcGF3bi1ndWl4LXB1Ymxpc2ggNjc4NyAi LUMiICJnemlwIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmlu Zy1hcHBlbmQgIi0tY2FjaGU9IiBjYWNoZSkpKSkKICAgICAgICAod2FpdC11bnRpbC1yZWFkeSA2 Nzg3KQogCiAgICAgICAgKGxldCogKChiYXNlICAgICAiaHR0cDovL2xvY2FsaG9zdDo2Nzg3LyIp Ci0tIAoyLjMwLjAKCg== --=-JA2BuOznOjtf9Vb3ouCF-- --=-OTlqsF/mW/i5c/rFfpnL Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYIADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYBb8YhccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7leTAQC/TTBrwKGg9dbnOh5qGC/Ew0wo yVhbCkP8IVx1PlaTZQEAqnXxKgqLZ2kuiYK9DygnyOXTFVXdKSrn4n5Riav0UAM= =O8VW -----END PGP SIGNATURE----- --=-OTlqsF/mW/i5c/rFfpnL-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 31 15:04:56 2021 Received: (at 46216) by debbugs.gnu.org; 31 Jan 2021 20:04:56 +0000 Received: from localhost ([127.0.0.1]:58102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Ixl-0004mN-64 for submit@debbugs.gnu.org; Sun, 31 Jan 2021 15:04:56 -0500 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Ixj-0004mD-CG for 46216@debbugs.gnu.org; Sun, 31 Jan 2021 15:04:48 -0500 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id PY4l2400D0mfAB401Y4lD7; Sun, 31 Jan 2021 21:04:45 +0100 Message-ID: <22d53945012c235334fb1b37262c000fcb666838.camel@telenet.be> Subject: [PATCH] Remove duplication in tests/publish.scm From: Maxime Devos To: 46216@debbugs.gnu.org Date: Sun, 31 Jan 2021 21:04:39 +0100 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-Gju4NQdHT6WNtmUzjhm9" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1612123485; bh=rvXm+iMA2en9+gmA8Cf05ddh/Ei5bkpGR3mljGmVYYs=; h=Subject:From:Reply-To:To:Date:In-Reply-To:References; b=eivnwZKeR7pvbHzPpsVtTffexSAffknYNoDWrDtmb8oV2xrXHJ3oRVqZZYo8gPFFq rMtiSqg7++5evHQhb0s/p+6XTycn5DU7uQawYEWagXwYYsr4FK9Kt22pF9gGh7yXvN wrPNUKTm6dIFCMd+aK44VkbeGLS5/USpWMSJuKclqFUK8+aecnxVtdr2vBBPzlpmgt dBBquAUiLlcS/eYvMNjQngJ/UIFHE4uJhg6Ol8NSXo0bG1231WZAyuOAzaBb+tQJbc v/BRGN++5zUoiln9eqyUbawYloyCLg7FqVIi5Mr1GdpIZbKmtzxfNXZv8sFhUAO1oi KXYrNRttZ4/cw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 46216 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 46216@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-Gju4NQdHT6WNtmUzjhm9 Content-Type: multipart/mixed; boundary="=-Gf9DlgRI0YJTkTwFrAlw" --=-Gf9DlgRI0YJTkTwFrAlw Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable This is the second patch in the series. Description from commit message: * tests/publish.scm (call-with-guix-publish, with-guix-publish): introduce combination of spawn-guix-publish and wait-until-ready, and adjust tests to use the macro. Maxime --=-Gf9DlgRI0YJTkTwFrAlw Content-Disposition: attachment; filename*0=0002-tests-publish-remove-duplicated-use-of-wait-until-re.pat; filename*1=ch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0002-tests-publish-remove-duplicated-use-of-wait-until-re.patch"; charset="UTF-8" RnJvbSBkYzE2NmY5NmRhOTUxZWQwNDVkZGM4NzQ0MTQyOGE0NDY5MzAzNWNkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFN1biwgMzEgSmFuIDIwMjEgMjA6NTg6NDYgKzAxMDAKU3ViamVjdDogW1BBVENIXSB0 ZXN0czogcHVibGlzaDogcmVtb3ZlIGR1cGxpY2F0ZWQgdXNlIG9mIHdhaXQtdW50aWwtcmVhZHkK CiogdGVzdHMvcHVibGlzaC5zY20KICAoY2FsbC13aXRoLWd1aXgtcHVibGlzaCwgd2l0aC1ndWl4 LXB1Ymxpc2gpOiBpbnRyb2R1Y2UKICBjb21iaW5hdGlvbiBvZiBzcGF3bi1ndWl4LXB1Ymxpc2gg YW5kIHdhaXQtdW50aWwtcmVhZHksCiAgYW5kIGFkanVzdCB0ZXN0cyB0byB1c2UgdGhlIG1hY3Jv LgotLS0KIHRlc3RzL3B1Ymxpc2guc2NtIHwgNjggKysrKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzMyBpbnNlcnRpb25zKCspLCAz NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9wdWJsaXNoLnNjbSBiL3Rlc3RzL3B1 Ymxpc2guc2NtCmluZGV4IDdjOTAzMzJiZGEuLmUyNGIwZmViMDAgMTAwNjQ0Ci0tLSBhL3Rlc3Rz L3B1Ymxpc2guc2NtCisrKyBiL3Rlc3RzL3B1Ymxpc2guc2NtCkBAIC0xMDYsNiArMTA2LDE4IEBA IFRoZSByZXN1bHRpbmcgdGhyZWFkIGlzIHJldHVybmVkLiIKICAgICAobGFtYmRhICgpCiAgICAg ICAoYXBwbHkgZ3VpeC1wdWJsaXNoIChmb3JtYXQgI2YgIi0tcG9ydD1+YSIgcG9ydCkgZXh0cmEt YXJndW1lbnRzKSkpKSkKIAorKGRlZmluZSAoY2FsbC13aXRoLWd1aXgtcHVibGlzaCBwb3J0IGV4 dHJhLWFyZ3VtZW50cyB0aHVuaykKKyAgIkNhbGwgVEhVTksgaW4gYW4gZW52aXJvbm1lbnQgd2hl cmUgYSBsb2NhbCBwdWJsaXNoaW5nIHNlcnZpY2UKK2lzIHJ1bm5pbmcgaW4gYSBzZXBhcmF0ZSB0 aHJlYWQsIGxpc3RlbmluZyBhdCBQT1JULiAgRVhUUkEtQVJHVU1FTlRTCithcmUgcGFzc2VkIGFz LWlzIGFzIGV4dHJhIGNvbW1hbmQtbGluZSBhcmd1bWVudHMuIgorICAobGV0ICgodGhyZWFkIChh cHBseSBzcGF3bi1ndWl4LXB1Ymxpc2ggcG9ydCBleHRyYS1hcmd1bWVudHMpKSkKKyAgICAod2Fp dC11bnRpbC1yZWFkeSBwb3J0KQorICAgICh0aHVuaykpKQorCisoZGVmaW5lLXN5bnRheC1ydWxl ICh3aXRoLWd1aXgtcHVibGlzaCBwb3J0IGV4dHJhLWFyZ3VtZW50cyBleHAgLi4uKQorICAoY2Fs bC13aXRoLWd1aXgtcHVibGlzaCBwb3J0IGV4dHJhLWFyZ3VtZW50cworICAgIChsYW1iZGEgKCkg ZXhwIC4uLikpKQorCiAoc3Bhd24tZ3VpeC1wdWJsaXNoIDY3ODkgIi1DMCIpCiAKIChkZWZpbmUg KHdhaXQtdW50aWwtcmVhZHkgcG9ydCkKQEAgLTI2Nyw4ICsyNzksNyBAQCBSZWZlcmVuY2VzOiB+ JSIKICAgYCgoIlN0b3JlUGF0aCIgLiAsJWl0ZW0pCiAgICAgKCJVUkwiIC4gLChzdHJpbmctYXBw ZW5kICJuYXIvZ3ppcC8iIChiYXNlbmFtZSAlaXRlbSkpKQogICAgICgiQ29tcHJlc3Npb24iIC4g Imd6aXAiKSkKLSAgKGxldCAoKHRocmVhZCAoc3Bhd24tZ3VpeC1wdWJsaXNoIDY3OTkgIi1DNSIp KSkKLSAgICAod2FpdC11bnRpbC1yZWFkeSA2Nzk5KQorICAod2l0aC1ndWl4LXB1Ymxpc2ggNjc5 OSAnKCItQzUiKQogICAgIChsZXQqICgodXJsICAoc3RyaW5nLWFwcGVuZCAiaHR0cDovL2xvY2Fs aG9zdDo2Nzk5LyIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0b3JlLXBhdGgt aGFzaC1wYXJ0ICVpdGVtKSAiLm5hcmluZm8iKSkKICAgICAgICAgICAgKGJvZHkgKGh0dHAtZ2V0 LXBvcnQgdXJsKSkpCkBAIC0yODQsOCArMjk1LDcgQEAgUmVmZXJlbmNlczogfiUiCiAgIGAoKCJT dG9yZVBhdGgiIC4gLCVpdGVtKQogICAgICgiVVJMIiAuICwoc3RyaW5nLWFwcGVuZCAibmFyL2x6 aXAvIiAoYmFzZW5hbWUgJWl0ZW0pKSkKICAgICAoIkNvbXByZXNzaW9uIiAuICJsemlwIikpCi0g IChsZXQgKCh0aHJlYWQgKHNwYXduLWd1aXgtcHVibGlzaCA2NzkwICItQ2x6aXAiKSkpCi0gICAg KHdhaXQtdW50aWwtcmVhZHkgNjc5MCkKKyAgKHdpdGgtZ3VpeC1wdWJsaXNoIDY3OTAgJygiLUNs emlwIikKICAgICAobGV0KiAoKHVybCAgKHN0cmluZy1hcHBlbmQgImh0dHA6Ly9sb2NhbGhvc3Q6 Njc5MC8iCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdG9yZS1wYXRoLWhhc2gt cGFydCAlaXRlbSkgIi5uYXJpbmZvIikpCiAgICAgICAgICAgIChib2R5IChodHRwLWdldC1wb3J0 IHVybCkpKQpAQCAtMzE5LDggKzMyOSw3IEBAIFJlZmVyZW5jZXM6IH4lIgogICAgIDIwMCkKICAg KGNhbGwtd2l0aC10ZW1wb3JhcnktZGlyZWN0b3J5CiAgICAobGFtYmRhIChjYWNoZSkKLSAgICAg KGxldCAoKHRocmVhZCAoc3Bhd24tZ3VpeC1wdWJsaXNoIDY3OTMgIi1DZ3ppcDoyIiAiLUNsemlw OjIiKSkpCi0gICAgICAgKHdhaXQtdW50aWwtcmVhZHkgNjc5MykKKyAgICAgKHdpdGgtZ3VpeC1w dWJsaXNoIDY3OTMgJygiLUNnemlwOjIiICItQ2x6aXA6MiIpCiAgICAgICAgKGxldCogKChiYXNl ICJodHRwOi8vbG9jYWxob3N0OjY3OTMvIikKICAgICAgICAgICAgICAgKHBhcnQgKHN0b3JlLXBh dGgtaGFzaC1wYXJ0ICVpdGVtKSkKICAgICAgICAgICAgICAgKHVybCAgKHN0cmluZy1hcHBlbmQg YmFzZSBwYXJ0ICIubmFyaW5mbyIpKQpAQCAtMzQwLDkgKzM0OSw3IEBAIFJlZmVyZW5jZXM6IH4l IgogICAgICAgICAgICgiQ29tcHJlc3Npb24iIC4gIm5vbmUiKSkKICAgICAgICAgMjAwCiAgICAg ICAgIDQwNCkKLSAgKGxldCAoKHRocmVhZCAoc3Bhd24tZ3VpeC1wdWJsaXNoIDY3OTggIi1DMCIK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICItLW5hci1wYXRoPS8vL2Zvby9i YXIvL2NoYm91aWIvIikpKQotICAgICh3YWl0LXVudGlsLXJlYWR5IDY3OTgpCisgICh3aXRoLWd1 aXgtcHVibGlzaCA2Nzk4ICcoIi1DMCIgIi0tbmFyLXBhdGg9Ly8vZm9vL2Jhci8vY2hib3VpYi8i KQogICAgIChsZXQqICgoYmFzZSAgICAiaHR0cDovL2xvY2FsaG9zdDo2Nzk4LyIpCiAgICAgICAg ICAgIChwYXJ0ICAgIChzdG9yZS1wYXRoLWhhc2gtcGFydCAlaXRlbSkpCiAgICAgICAgICAgICh1 cmwgICAgIChzdHJpbmctYXBwZW5kIGJhc2UgcGFydCAiLm5hcmluZm8iKSkKQEAgLTQyMywxMCAr NDMwLDggQEAgUmVmZXJlbmNlczogfiUiCiAgICAgICAgIDQwNCkgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDtuYXIv4oCmCiAgIChjYWxsLXdpdGgtdGVtcG9yYXJ5LWRpcmVj dG9yeQogICAgKGxhbWJkYSAoY2FjaGUpCi0gICAgIChsZXQgKCh0aHJlYWQgKHNwYXduLWd1aXgt cHVibGlzaCA2Nzk3ICItQzIiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAoc3RyaW5nLWFwcGVuZCAiLS1jYWNoZT0iIGNhY2hlKQotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIi0tY2FjaGUtYnlwYXNzLXRocmVzaG9sZD0wIikpKQotICAgICAg ICh3YWl0LXVudGlsLXJlYWR5IDY3OTcpCisgICAgICh3aXRoLWd1aXgtcHVibGlzaCA2Nzk3IGAo Ii1DMiIgLChzdHJpbmctYXBwZW5kICItLWNhY2hlPSIgY2FjaGUpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIi0tY2FjaGUtYnlwYXNzLXRocmVzaG9sZD0wIikKICAgICAgICAobGV0 KiAoKGJhc2UgICAgICJodHRwOi8vbG9jYWxob3N0OjY3OTcvIikKICAgICAgICAgICAgICAgKHBh cnQgICAgIChzdG9yZS1wYXRoLWhhc2gtcGFydCAlaXRlbSkpCiAgICAgICAgICAgICAgICh1cmwg ICAgICAoc3RyaW5nLWFwcGVuZCBiYXNlIHBhcnQgIi5uYXJpbmZvIikpCkBAIC00NzUsMTAgKzQ4 MCw5IEBAIFJlZmVyZW5jZXM6IH4lIgogICAnKDIwMCAyMDAgNDA0KQogICAoY2FsbC13aXRoLXRl bXBvcmFyeS1kaXJlY3RvcnkKICAgIChsYW1iZGEgKGNhY2hlKQotICAgICAobGV0ICgodGhyZWFk IChzcGF3bi1ndWl4LXB1Ymxpc2ggNjc5NCAiLUNnemlwOjIiICItQ2x6aXA6MiIKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICItLWNhY2hlPSIg Y2FjaGUpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1jYWNoZS1i eXBhc3MtdGhyZXNob2xkPTAiKSkpCi0gICAgICAgKHdhaXQtdW50aWwtcmVhZHkgNjc5NCkKKyAg ICAgKHdpdGgtZ3VpeC1wdWJsaXNoIDY3OTQgYCgiLUNnemlwOjIiICItQ2x6aXA6MiIKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAsKHN0cmluZy1hcHBlbmQgIi0tY2FjaGU9IiBjYWNo ZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1jYWNoZS1ieXBhc3MtdGhyZXNo b2xkPTAiKQogICAgICAgIChsZXQqICgoYmFzZSAgICAgImh0dHA6Ly9sb2NhbGhvc3Q6Njc5NC8i KQogICAgICAgICAgICAgICAocGFydCAgICAgKHN0b3JlLXBhdGgtaGFzaC1wYXJ0ICVpdGVtKSkK ICAgICAgICAgICAgICAgKHVybCAgICAgIChzdHJpbmctYXBwZW5kIGJhc2UgcGFydCAiLm5hcmlu Zm8iKSkKQEAgLTUyOCwxMyArNTMyLDkgQEAgUmVmZXJlbmNlczogfiUiCiAgICAgICAgICAgNDA0 KSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDtuYXIvZ3ppcC/igKYKICAgICAo Y2FsbC13aXRoLXRlbXBvcmFyeS1kaXJlY3RvcnkKICAgICAgKGxhbWJkYSAoY2FjaGUpCi0gICAg ICAgKGxldCAoKHRocmVhZCAod2l0aC1zZXBhcmF0ZS1vdXRwdXQtcG9ydHMKLSAgICAgICAgICAg ICAgICAgICAgICAoY2FsbC13aXRoLW5ldy10aHJlYWQKLSAgICAgICAgICAgICAgICAgICAgICAg KGxhbWJkYSAoKQotICAgICAgICAgICAgICAgICAgICAgICAgIChndWl4LXB1Ymxpc2ggIi0tcG9y dD02Nzk2IiAiLUMyIiAiLS10dGw9NDJoIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKHN0cmluZy1hcHBlbmQgIi0tY2FjaGU9IiBjYWNoZSkKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICItLWNhY2hlLWJ5cGFzcy10aHJlc2hvbGQ9MCIpKSkp KSkKLSAgICAgICAgICh3YWl0LXVudGlsLXJlYWR5IDY3OTYpCisgICAgICAgKHdpdGgtZ3VpeC1w dWJsaXNoIDY3OTYgYCgiLUMyIiAiLS10dGw9NDJoIgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgLChzdHJpbmctYXBwZW5kICItLWNhY2hlPSIgY2FjaGUpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiLS1jYWNoZS1ieXBhc3MtdGhyZXNob2xkPTAiKQogICAgICAg ICAgKGxldCogKChiYXNlICAgICAiaHR0cDovL2xvY2FsaG9zdDo2Nzk2LyIpCiAgICAgICAgICAg ICAgICAgKHBhcnQgICAgIChzdG9yZS1wYXRoLWhhc2gtcGFydCBpdGVtKSkKICAgICAgICAgICAg ICAgICAodXJsICAgICAgKHN0cmluZy1hcHBlbmQgYmFzZSBwYXJ0ICIubmFyaW5mbyIpKQpAQCAt NTgwLDkgKzU4MCw3IEBAIFJlZmVyZW5jZXM6IH4lIgogICAyMDAKICAgKGNhbGwtd2l0aC10ZW1w b3JhcnktZGlyZWN0b3J5CiAgICAobGFtYmRhIChjYWNoZSkKLSAgICAgKGxldCAoKHRocmVhZCAo c3Bhd24tZ3VpeC1wdWJsaXNoIDY3OTUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIChzdHJpbmctYXBwZW5kICItLWNhY2hlPSIgY2FjaGUpKSkpCi0gICAgICAgKHdhaXQt dW50aWwtcmVhZHkgNjc5NSkKKyAgICAgKHdpdGgtZ3VpeC1wdWJsaXNoIDY3OTUgKGxpc3QgKHN0 cmluZy1hcHBlbmQgIi0tY2FjaGU9IiBjYWNoZSkpCiAKICAgICAgICA7OyBNYWtlIHN1cmUgdGhh dCwgZXZlbiBpZiBJVEVNIGRpc2FwcGVhcnMsIHdlJ3JlIHN0aWxsIGFibGUgdG8gZmV0Y2gKICAg ICAgICA7OyBpdC4KQEAgLTYwNCwxMSArNjAyLDggQEAgUmVmZXJlbmNlczogfiUiCiAgIDIwMAog ICAoY2FsbC13aXRoLXRlbXBvcmFyeS1kaXJlY3RvcnkKICAgIChsYW1iZGEgKGNhY2hlKQotICAg ICAobGV0ICgodGhyZWFkIChzcGF3bi1ndWl4LXB1Ymxpc2ggNjc4OCAiLUMiICJnemlwIgotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tcG9ydD02Nzg4IiAiLUMiICJn emlwIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBl bmQgIi0tY2FjaGU9IiBjYWNoZSkpKSkKLSAgICAgICAod2FpdC11bnRpbC1yZWFkeSA2Nzg4KQot CisgICAgICh3aXRoLWd1aXgtcHVibGlzaCA2Nzg4IGAoIi1DIiAiZ3ppcCIgIi1DIiAiZ3ppcCIK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAsKHN0cmluZy1hcHBlbmQgIi0tY2FjaGU9 IiBjYWNoZSkpCiAgICAgICAgKGxldCogKChiYXNlICAgICAiaHR0cDovL2xvY2FsaG9zdDo2Nzg4 LyIpCiAgICAgICAgICAgICAgIChpdGVtICAgICAoYWRkLXRleHQtdG8tc3RvcmUgJXN0b3JlICJy YW5kb20iIChyYW5kb20tdGV4dCkpKQogICAgICAgICAgICAgICAocGFydCAgICAgKHN0b3JlLXBh dGgtaGFzaC1wYXJ0IGl0ZW0pKQpAQCAtNjM4LDkgKzYzMyw3IEBAIFJlZmVyZW5jZXM6IH4lIgog ICA7OyBmb3IgYSBub24tZXhpc3RpbmcgZmlsZSBuYW1lLgogICAoY2FsbC13aXRoLXRlbXBvcmFy eS1kaXJlY3RvcnkKICAgIChsYW1iZGEgKGNhY2hlKQotICAgICAobGV0ICgodGhyZWFkIChzcGF3 bi1ndWl4LXB1Ymxpc2ggNjc4NyAiLUMiICJnemlwIgotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgIi0tY2FjaGU9IiBjYWNoZSkpKSkKLSAgICAg ICAod2FpdC11bnRpbC1yZWFkeSA2Nzg3KQorICAgICAod2l0aC1ndWl4LXB1Ymxpc2ggNjc4NyBg KCItQyIgImd6aXAiICwoc3RyaW5nLWFwcGVuZCAiLS1jYWNoZT0iIGNhY2hlKSkKIAogICAgICAg IChsZXQqICgoYmFzZSAgICAgImh0dHA6Ly9sb2NhbGhvc3Q6Njc4Ny8iKQogICAgICAgICAgICAg ICAoaXRlbSAgICAgKGFkZC10ZXh0LXRvLXN0b3JlICVzdG9yZSAicmFuZG9tIiAocmFuZG9tLXRl eHQpKSkKQEAgLTcwMiwzICs2OTUsOCBAQCBSZWZlcmVuY2VzOiB+JSIKICAgICAgICAgICAgICAg IChodHRwLXBvc3QgKHB1Ymxpc2gtdXJpIHBhdGgpKSkpKSkKIAogKHRlc3QtZW5kICJwdWJsaXNo IikKKworOzsgTG9jYWwgVmFyaWFibGVzOgorOzsgZXZhbDogKHB1dCAnd2l0aC1ndWl4LXB1Ymxp c2ggJ3NjaGVtZS1pbmRlbnQtZnVuY3Rpb24gMikKKzs7IGV2YWw6IChwdXQgJ2NhbGwtd2l0aC1n dWl4LXB1Ymxpc2ggJ3NjaGVtZS1pbmRlbnQtZnVuY3Rpb24gMikKKzs7IEVuZDoKLS0gCjIuMzAu MAoK --=-Gf9DlgRI0YJTkTwFrAlw-- --=-Gju4NQdHT6WNtmUzjhm9 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYIADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYBcNVxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7pmaAP4uEAtWJYs7gjs4esHx37V4vvsp 0Tl+P+aKWdlD8oCJhAEAglXt5chQyQ3ICNAC9RXm2H+dR/DrGzAQHaG9EDVbywM= =sacn -----END PGP SIGNATURE----- --=-Gju4NQdHT6WNtmUzjhm9-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 31 17:02:10 2021 Received: (at submit) by debbugs.gnu.org; 31 Jan 2021 22:02:10 +0000 Received: from localhost ([127.0.0.1]:58250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6KnJ-0000xA-9p for submit@debbugs.gnu.org; Sun, 31 Jan 2021 17:02:10 -0500 Received: from lists.gnu.org ([209.51.188.17]:49068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6KnF-0000u6-LO for submit@debbugs.gnu.org; Sun, 31 Jan 2021 17:02:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6KnD-0007PZ-TQ for guix-patches@gnu.org; Sun, 31 Jan 2021 17:02:05 -0500 Received: from albert.telenet-ops.be ([2a02:1800:110:4::f00:1a]:37862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6Kn8-0000el-UW for guix-patches@gnu.org; Sun, 31 Jan 2021 17:02:03 -0500 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id Pa1u2400E0mfAB406a1ug8; Sun, 31 Jan 2021 23:01:54 +0100 Message-ID: <077d7e5c5e6935fce1e816784a03e55eb274dc50.camel@telenet.be> Subject: Re: [PATCH] Remove duplication in tests/publish.scm From: Maxime Devos To: guix-patches@gnu.org Date: Sun, 31 Jan 2021 23:01:48 +0100 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-RB5khHq839Jrf/8EBOqD" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1612130514; bh=WOL+/PMxdprv3D5tIfuT1cO2Ax1KCBnhf5ZgUVdD0GM=; h=Subject:From:Reply-To:To:Date:In-Reply-To:References; b=PZVwG3sJ0fKcpwh0PMJnIODg1u02RFIen+XAXjgBqHWt7JdrIQFT+587GcHlBdB8e egnL9s37UHUa+iU76xT6LhqwvKLroYw0V5jKBlUJPzEjqPahMC/cEbpCb3LziBI7MT P6746NMW/lzToCQ4HkXfrIa0OUCas0B4iXy2ckyrZERFhOfvYuy4joiMdNyh5TBgab 4SNuq2kCbqMAWjJA6bLfLrsyaRFU/+jHgY6uxpiq5fBRN2Oykj4JDYav2zHiHpC6D8 BObZv8G0IANr20E/G/pc2TKhdl0kuRuPKDPgE5PsMwe5oUx5cbHWwzOg+d4djXe1lk 06gpa9SQVXVHg== Received-SPF: pass client-ip=2a02:1800:110:4::f00:1a; envelope-from=maximedevos@telenet.be; helo=albert.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 46216@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-RB5khHq839Jrf/8EBOqD Content-Type: multipart/mixed; boundary="=-KHF69gdnvOhvUmkdrndt" --=-KHF69gdnvOhvUmkdrndt Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable This is the third patch in the series. Description from patch: This way, there's no risk of accidentally reusing a port number used by another test. This changes the workings of the "/*.narinfo for a compressed file" test a little, by not reusing the port from the test "/*.narinfo with compression". * tests/publish.scm (*latest-port*, call-with-guix-publish, with-guix-publish): automatically assign port numbers, and change tests to use the new calling rules. --=-KHF69gdnvOhvUmkdrndt Content-Disposition: attachment; filename*0=0003-tests-publish-automatically-keep-track-of-port-numbe.pat; filename*1=ch Content-Type: text/x-patch; name="0003-tests-publish-automatically-keep-track-of-port-numbe.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAzNTQ4YmU5Y2I3Yjg2MmIwNGRlZmFkMDgwYTgwYzg1MzExNDc1YzA2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFN1biwgMzEgSmFuIDIwMjEgMjI6NTM6MDQgKzAxMDAKU3ViamVjdDogW1BBVENIIDMv M10gdGVzdHM6IHB1Ymxpc2g6IGF1dG9tYXRpY2FsbHkga2VlcCB0cmFjayBvZiBwb3J0IG51bWJl cnMKClRoaXMgd2F5LCB0aGVyZSdzIG5vIHJpc2sgb2YgYWNjaWRlbnRhbGx5IHJldXNpbmcgYQpw b3J0IG51bWJlciB1c2VkIGJ5IGFub3RoZXIgdGVzdC4gIFRoaXMgY2hhbmdlcyB0aGUKd29ya2lu Z3Mgb2YgdGhlICIvKi5uYXJpbmZvIGZvciBhIGNvbXByZXNzZWQgZmlsZSIgdGVzdAphIGxpdHRs ZSwgYnkgbm90IHJldXNpbmcgdGhlIHBvcnQgZnJvbSB0aGUgdGVzdAoiLyoubmFyaW5mbyB3aXRo IGNvbXByZXNzaW9uIi4KCiogdGVzdHMvcHVibGlzaC5zY20KICAoKmxhdGVzdC1wb3J0KiwgY2Fs bC13aXRoLWd1aXgtcHVibGlzaCwgd2l0aC1ndWl4LXB1Ymxpc2gpOgogIGF1dG9tYXRpY2FsbHkg YXNzaWduIHBvcnQgbnVtYmVycywgYW5kIGNoYW5nZSB0ZXN0cyB0bwogIHVzZSB0aGUgbmV3IGNh bGxpbmcgcnVsZXMuCi0tLQogdGVzdHMvcHVibGlzaC5zY20gfCA4NCArKysrKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ1IGluc2Vy dGlvbnMoKyksIDM5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL3B1Ymxpc2guc2Nt IGIvdGVzdHMvcHVibGlzaC5zY20KaW5kZXggZTI0YjBmZWIwMC4uMGExMzJkZmUwNCAxMDA2NDQK LS0tIGEvdGVzdHMvcHVibGlzaC5zY20KKysrIGIvdGVzdHMvcHVibGlzaC5zY20KQEAgLTEwNiwx NyArMTA2LDIzIEBAIFRoZSByZXN1bHRpbmcgdGhyZWFkIGlzIHJldHVybmVkLiIKICAgICAobGFt YmRhICgpCiAgICAgICAoYXBwbHkgZ3VpeC1wdWJsaXNoIChmb3JtYXQgI2YgIi0tcG9ydD1+YSIg cG9ydCkgZXh0cmEtYXJndW1lbnRzKSkpKSkKIAotKGRlZmluZSAoY2FsbC13aXRoLWd1aXgtcHVi bGlzaCBwb3J0IGV4dHJhLWFyZ3VtZW50cyB0aHVuaykKLSAgIkNhbGwgVEhVTksgaW4gYW4gZW52 aXJvbm1lbnQgd2hlcmUgYSBsb2NhbCBwdWJsaXNoaW5nIHNlcnZpY2UKLWlzIHJ1bm5pbmcgaW4g YSBzZXBhcmF0ZSB0aHJlYWQsIGxpc3RlbmluZyBhdCBQT1JULiAgRVhUUkEtQVJHVU1FTlRTCi1h cmUgcGFzc2VkIGFzLWlzIGFzIGV4dHJhIGNvbW1hbmQtbGluZSBhcmd1bWVudHMuIgotICAobGV0 ICgodGhyZWFkIChhcHBseSBzcGF3bi1ndWl4LXB1Ymxpc2ggcG9ydCBleHRyYS1hcmd1bWVudHMp KSkKKzs7IEtlZXAgdHJhY2sgb2YgcG9ydCBudW1iZXJzLCB0byBhdm9pZCBtdWx0aXBsZQorOzsg c2VydmVycyBsaXN0ZW5pbmcgYXQgdGhlIHNhbWUgcG9ydC4KKyhkZWZpbmUgKmxhdGVzdC1wb3J0 KiA2Nzg5KQorCisoZGVmaW5lIChjYWxsLXdpdGgtZ3VpeC1wdWJsaXNoIGV4dHJhLWFyZ3VtZW50 cyBwcm9jKQorICAiQ2FsbCBQUk9DIGluIGFuIGVudmlyb25tZW50IHdoZXJlIGEgbG9jYWwgcHVi bGlzaGluZyBzZXJ2aWNlCitpcyBydW5uaW5nIGluIGEgc2VwYXJhdGUgdGhyZWFkLCBwYXNzaW5n IHRoZSBwb3J0IGxpc3RlbmVkIGF0LgorRVhUUkEtQVJHVU1FTlRTIGFyZSBwYXNzZWQgYXMtaXMg YXMgZXh0cmEgY29tbWFuZC1saW5lIGFyZ3VtZW50cy4iCisgIChsZXQqICgocG9ydCAoMSsgKmxh dGVzdC1wb3J0KikpCisgICAgICAgICAodGhyZWFkIChhcHBseSBzcGF3bi1ndWl4LXB1Ymxpc2gg cG9ydCBleHRyYS1hcmd1bWVudHMpKSkKKyAgICAoc2V0ISAqbGF0ZXN0LXBvcnQqIHBvcnQpCiAg ICAgKHdhaXQtdW50aWwtcmVhZHkgcG9ydCkKLSAgICAodGh1bmspKSkKKyAgICAocHJvYyBwb3J0 KSkpCiAKIChkZWZpbmUtc3ludGF4LXJ1bGUgKHdpdGgtZ3VpeC1wdWJsaXNoIHBvcnQgZXh0cmEt YXJndW1lbnRzIGV4cCAuLi4pCi0gIChjYWxsLXdpdGgtZ3VpeC1wdWJsaXNoIHBvcnQgZXh0cmEt YXJndW1lbnRzCi0gICAgKGxhbWJkYSAoKSBleHAgLi4uKSkpCisgIChjYWxsLXdpdGgtZ3VpeC1w dWJsaXNoIGV4dHJhLWFyZ3VtZW50cworICAgIChsYW1iZGEgKHBvcnQpIGV4cCAuLi4pKSkKIAog KHNwYXduLWd1aXgtcHVibGlzaCA2Nzg5ICItQzAiKQogCkBAIC0yNzksOSArMjg1LDkgQEAgUmVm ZXJlbmNlczogfiUiCiAgIGAoKCJTdG9yZVBhdGgiIC4gLCVpdGVtKQogICAgICgiVVJMIiAuICwo c3RyaW5nLWFwcGVuZCAibmFyL2d6aXAvIiAoYmFzZW5hbWUgJWl0ZW0pKSkKICAgICAoIkNvbXBy ZXNzaW9uIiAuICJnemlwIikpCi0gICh3aXRoLWd1aXgtcHVibGlzaCA2Nzk5ICcoIi1DNSIpCi0g ICAgKGxldCogKCh1cmwgIChzdHJpbmctYXBwZW5kICJodHRwOi8vbG9jYWxob3N0OjY3OTkvIgot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RvcmUtcGF0aC1oYXNoLXBhcnQgJWl0 ZW0pICIubmFyaW5mbyIpKQorICAod2l0aC1ndWl4LXB1Ymxpc2ggcG9ydCAnKCItQzUiKQorICAg IChsZXQqICgodXJsICAoZm9ybWF0ICNmICJodHRwOi8vbG9jYWxob3N0On5hL35hLm5hcmluZm8i IHBvcnQKKyAgICAgICAgICAgICAgICAgICAgICAgICAoc3RvcmUtcGF0aC1oYXNoLXBhcnQgJWl0 ZW0pKSkKICAgICAgICAgICAgKGJvZHkgKGh0dHAtZ2V0LXBvcnQgdXJsKSkpCiAgICAgICAoZmls dGVyIChsYW1iZGEgKGl0ZW0pCiAgICAgICAgICAgICAgICAgKG1hdGNoIGl0ZW0KQEAgLTI5NSw5 ICszMDEsOSBAQCBSZWZlcmVuY2VzOiB+JSIKICAgYCgoIlN0b3JlUGF0aCIgLiAsJWl0ZW0pCiAg ICAgKCJVUkwiIC4gLChzdHJpbmctYXBwZW5kICJuYXIvbHppcC8iIChiYXNlbmFtZSAlaXRlbSkp KQogICAgICgiQ29tcHJlc3Npb24iIC4gImx6aXAiKSkKLSAgKHdpdGgtZ3VpeC1wdWJsaXNoIDY3 OTAgJygiLUNsemlwIikKLSAgICAobGV0KiAoKHVybCAgKHN0cmluZy1hcHBlbmQgImh0dHA6Ly9s b2NhbGhvc3Q6Njc5MC8iCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdG9yZS1w YXRoLWhhc2gtcGFydCAlaXRlbSkgIi5uYXJpbmZvIikpCisgICh3aXRoLWd1aXgtcHVibGlzaCBw b3J0ICcoIi1DbHppcCIpCisgICAgKGxldCogKCh1cmwgIChmb3JtYXQgI2YgImh0dHA6Ly9sb2Nh bGhvc3Q6fmEvfmEubmFyaW5mbyIgcG9ydAorICAgICAgICAgICAgICAgICAgICAgICAgIChzdG9y ZS1wYXRoLWhhc2gtcGFydCAlaXRlbSkpKQogICAgICAgICAgICAoYm9keSAoaHR0cC1nZXQtcG9y dCB1cmwpKSkKICAgICAgIChmaWx0ZXIgKGxhbWJkYSAoaXRlbSkKICAgICAgICAgICAgICAgICAo bWF0Y2ggaXRlbQpAQCAtMzA5LDE1ICszMTUsMTUgQEAgUmVmZXJlbmNlczogfiUiCiAKICh0ZXN0 LWVxdWFsICIvKi5uYXJpbmZvIGZvciBhIGNvbXByZXNzZWQgZmlsZSIKICAgJygibm9uZSIgIm5h ciIpICAgICAgICAgIDtjb21wcmVzc2lvbi1sZXNzIG5hcgotICA7OyBBc3N1bWUgJ2d1aXggcHVi bGlzaCAtQycgaXMgYWxyZWFkeSBydW5uaW5nIG9uIHBvcnQgNjc5OS4KLSAgKGxldCogKChpdGVt IChhZGQtdGV4dC10by1zdG9yZSAlc3RvcmUgImZha2UudGFyLmd6IgotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICJUaGlzIGlzIGEgZmFrZSBjb21wcmVzc2VkIGZpbGUuIikpCi0g ICAgICAgICAodXJsICAoc3RyaW5nLWFwcGVuZCAiaHR0cDovL2xvY2FsaG9zdDo2Nzk5LyIKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdG9yZS1wYXRoLWhhc2gtcGFydCBpdGVtKSAi Lm5hcmluZm8iKSkKLSAgICAgICAgIChib2R5IChodHRwLWdldC1wb3J0IHVybCkpCi0gICAgICAg ICAoaW5mbyAocmVjdXRpbHMtPmFsaXN0IGJvZHkpKSkKLSAgICAobGlzdCAoYXNzb2MtcmVmIGlu Zm8gIkNvbXByZXNzaW9uIikKLSAgICAgICAgICAoZGlybmFtZSAoYXNzb2MtcmVmIGluZm8gIlVS TCIpKSkpKQorICAod2l0aC1ndWl4LXB1Ymxpc2ggcG9ydCAnKCItQzUiKQorICAgIChsZXQqICgo aXRlbSAoYWRkLXRleHQtdG8tc3RvcmUgJXN0b3JlICJmYWtlLnRhci5neiIKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICJUaGlzIGlzIGEgZmFrZSBjb21wcmVzc2VkIGZpbGUu IikpCisgICAgICAgICAgICh1cmwgIChmb3JtYXQgI2YgImh0dHA6Ly9sb2NhbGhvc3Q6fmEvfmEu bmFyaW5mbyIgcG9ydAorICAgICAgICAgICAgICAgICAgICAgICAgIChzdG9yZS1wYXRoLWhhc2gt cGFydCBpdGVtKSkpCisgICAgICAgICAgIChib2R5IChodHRwLWdldC1wb3J0IHVybCkpCisgICAg ICAgICAgIChpbmZvIChyZWN1dGlscy0+YWxpc3QgYm9keSkpKQorICAgICAgKGxpc3QgKGFzc29j LXJlZiBpbmZvICJDb21wcmVzc2lvbiIpCisgICAgICAgICAgICAoZGlybmFtZSAoYXNzb2MtcmVm IGluZm8gIlVSTCIpKSkpKSkKIAogKHRlc3QtZXF1YWwgIi8qLm5hcmluZm8gd2l0aCBsemlwICsg Z3ppcCIKICAgYCgoKCJTdG9yZVBhdGgiIC4gLCVpdGVtKQpAQCAtMzI5LDggKzMzNSw4IEBAIFJl ZmVyZW5jZXM6IH4lIgogICAgIDIwMCkKICAgKGNhbGwtd2l0aC10ZW1wb3JhcnktZGlyZWN0b3J5 CiAgICAobGFtYmRhIChjYWNoZSkKLSAgICAgKHdpdGgtZ3VpeC1wdWJsaXNoIDY3OTMgJygiLUNn emlwOjIiICItQ2x6aXA6MiIpCi0gICAgICAgKGxldCogKChiYXNlICJodHRwOi8vbG9jYWxob3N0 OjY3OTMvIikKKyAgICAgKHdpdGgtZ3VpeC1wdWJsaXNoIHBvcnQgJygiLUNnemlwOjIiICItQ2x6 aXA6MiIpCisgICAgICAgKGxldCogKChiYXNlIChmb3JtYXQgI2YgImh0dHA6Ly9sb2NhbGhvc3Q6 fmEvIiBwb3J0KSkKICAgICAgICAgICAgICAgKHBhcnQgKHN0b3JlLXBhdGgtaGFzaC1wYXJ0ICVp dGVtKSkKICAgICAgICAgICAgICAgKHVybCAgKHN0cmluZy1hcHBlbmQgYmFzZSBwYXJ0ICIubmFy aW5mbyIpKQogICAgICAgICAgICAgICAoYm9keSAoaHR0cC1nZXQtcG9ydCB1cmwpKSkKQEAgLTM0 OSw4ICszNTUsOCBAQCBSZWZlcmVuY2VzOiB+JSIKICAgICAgICAgICAoIkNvbXByZXNzaW9uIiAu ICJub25lIikpCiAgICAgICAgIDIwMAogICAgICAgICA0MDQpCi0gICh3aXRoLWd1aXgtcHVibGlz aCA2Nzk4ICcoIi1DMCIgIi0tbmFyLXBhdGg9Ly8vZm9vL2Jhci8vY2hib3VpYi8iKQotICAgIChs ZXQqICgoYmFzZSAgICAiaHR0cDovL2xvY2FsaG9zdDo2Nzk4LyIpCisgICh3aXRoLWd1aXgtcHVi bGlzaCBwb3J0ICcoIi1DMCIgIi0tbmFyLXBhdGg9Ly8vZm9vL2Jhci8vY2hib3VpYi8iKQorICAg IChsZXQqICgoYmFzZSAgICAoZm9ybWF0ICNmICJodHRwOi8vbG9jYWxob3N0On5hLyIgcG9ydCkp CiAgICAgICAgICAgIChwYXJ0ICAgIChzdG9yZS1wYXRoLWhhc2gtcGFydCAlaXRlbSkpCiAgICAg ICAgICAgICh1cmwgICAgIChzdHJpbmctYXBwZW5kIGJhc2UgcGFydCAiLm5hcmluZm8iKSkKICAg ICAgICAgICAgKG5hci11cmwgKHN0cmluZy1hcHBlbmQgYmFzZSAiZm9vL2Jhci9jaGJvdWliLyIK QEAgLTQzMCw5ICs0MzYsOSBAQCBSZWZlcmVuY2VzOiB+JSIKICAgICAgICAgNDA0KSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgO25hci/igKYKICAgKGNhbGwtd2l0aC10ZW1w b3JhcnktZGlyZWN0b3J5CiAgICAobGFtYmRhIChjYWNoZSkKLSAgICAgKHdpdGgtZ3VpeC1wdWJs aXNoIDY3OTcgYCgiLUMyIiAsKHN0cmluZy1hcHBlbmQgIi0tY2FjaGU9IiBjYWNoZSkKKyAgICAg KHdpdGgtZ3VpeC1wdWJsaXNoIHBvcnQgYCgiLUMyIiAsKHN0cmluZy1hcHBlbmQgIi0tY2FjaGU9 IiBjYWNoZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1jYWNoZS1ieXBhc3Mt dGhyZXNob2xkPTAiKQotICAgICAgIChsZXQqICgoYmFzZSAgICAgImh0dHA6Ly9sb2NhbGhvc3Q6 Njc5Ny8iKQorICAgICAgIChsZXQqICgoYmFzZSAgICAgKGZvcm1hdCAjZiAiaHR0cDovL2xvY2Fs aG9zdDp+YS8iIHBvcnQpKQogICAgICAgICAgICAgICAocGFydCAgICAgKHN0b3JlLXBhdGgtaGFz aC1wYXJ0ICVpdGVtKSkKICAgICAgICAgICAgICAgKHVybCAgICAgIChzdHJpbmctYXBwZW5kIGJh c2UgcGFydCAiLm5hcmluZm8iKSkKICAgICAgICAgICAgICAgKG5hci11cmwgIChzdHJpbmctYXBw ZW5kIGJhc2UgIm5hci9nemlwLyIgKGJhc2VuYW1lICVpdGVtKSkpCkBAIC00ODAsMTAgKzQ4Niwx MCBAQCBSZWZlcmVuY2VzOiB+JSIKICAgJygyMDAgMjAwIDQwNCkKICAgKGNhbGwtd2l0aC10ZW1w b3JhcnktZGlyZWN0b3J5CiAgICAobGFtYmRhIChjYWNoZSkKLSAgICAgKHdpdGgtZ3VpeC1wdWJs aXNoIDY3OTQgYCgiLUNnemlwOjIiICItQ2x6aXA6MiIKKyAgICAgKHdpdGgtZ3VpeC1wdWJsaXNo IHBvcnQgYCgiLUNnemlwOjIiICItQ2x6aXA6MiIKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAsKHN0cmluZy1hcHBlbmQgIi0tY2FjaGU9IiBjYWNoZSkKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiLS1jYWNoZS1ieXBhc3MtdGhyZXNob2xkPTAiKQotICAgICAgIChsZXQq ICgoYmFzZSAgICAgImh0dHA6Ly9sb2NhbGhvc3Q6Njc5NC8iKQorICAgICAgIChsZXQqICgoYmFz ZSAgICAgKGZvcm1hdCAjZiAiaHR0cDovL2xvY2FsaG9zdDp+YS8iIHBvcnQpKQogICAgICAgICAg ICAgICAocGFydCAgICAgKHN0b3JlLXBhdGgtaGFzaC1wYXJ0ICVpdGVtKSkKICAgICAgICAgICAg ICAgKHVybCAgICAgIChzdHJpbmctYXBwZW5kIGJhc2UgcGFydCAiLm5hcmluZm8iKSkKICAgICAg ICAgICAgICAgKG5hci11cmwgIChjdXRlIHN0cmluZy1hcHBlbmQgIm5hci8iIDw+ICIvIgpAQCAt NTMyLDEwICs1MzgsMTAgQEAgUmVmZXJlbmNlczogfiUiCiAgICAgICAgICAgNDA0KSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDtuYXIvZ3ppcC/igKYKICAgICAoY2FsbC13aXRo LXRlbXBvcmFyeS1kaXJlY3RvcnkKICAgICAgKGxhbWJkYSAoY2FjaGUpCi0gICAgICAgKHdpdGgt Z3VpeC1wdWJsaXNoIDY3OTYgYCgiLUMyIiAiLS10dGw9NDJoIgorICAgICAgICh3aXRoLWd1aXgt cHVibGlzaCBwb3J0IGAoIi1DMiIgIi0tdHRsPTQyaCIKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICwoc3RyaW5nLWFwcGVuZCAiLS1jYWNoZT0iIGNhY2hlKQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIi0tY2FjaGUtYnlwYXNzLXRocmVzaG9sZD0wIikKLSAgICAg ICAgIChsZXQqICgoYmFzZSAgICAgImh0dHA6Ly9sb2NhbGhvc3Q6Njc5Ni8iKQorICAgICAgICAg KGxldCogKChiYXNlICAgICAoZm9ybWF0ICNmICJodHRwOi8vbG9jYWxob3N0On5hLyIgcG9ydCkp CiAgICAgICAgICAgICAgICAgKHBhcnQgICAgIChzdG9yZS1wYXRoLWhhc2gtcGFydCBpdGVtKSkK ICAgICAgICAgICAgICAgICAodXJsICAgICAgKHN0cmluZy1hcHBlbmQgYmFzZSBwYXJ0ICIubmFy aW5mbyIpKQogICAgICAgICAgICAgICAgIChjYWNoZWQgICAoc3RyaW5nLWFwcGVuZCBjYWNoZSAi L25vbmUvIgpAQCAtNTgwLDExICs1ODYsMTEgQEAgUmVmZXJlbmNlczogfiUiCiAgIDIwMAogICAo Y2FsbC13aXRoLXRlbXBvcmFyeS1kaXJlY3RvcnkKICAgIChsYW1iZGEgKGNhY2hlKQotICAgICAo d2l0aC1ndWl4LXB1Ymxpc2ggNjc5NSAobGlzdCAoc3RyaW5nLWFwcGVuZCAiLS1jYWNoZT0iIGNh Y2hlKSkKKyAgICAgKHdpdGgtZ3VpeC1wdWJsaXNoIHBvcnQgKGxpc3QgKHN0cmluZy1hcHBlbmQg Ii0tY2FjaGU9IiBjYWNoZSkpCiAKICAgICAgICA7OyBNYWtlIHN1cmUgdGhhdCwgZXZlbiBpZiBJ VEVNIGRpc2FwcGVhcnMsIHdlJ3JlIHN0aWxsIGFibGUgdG8gZmV0Y2gKICAgICAgICA7OyBpdC4K LSAgICAgICAobGV0KiAoKGJhc2UgICAgICJodHRwOi8vbG9jYWxob3N0OjY3OTUvIikKKyAgICAg ICAobGV0KiAoKGJhc2UgICAgIChmb3JtYXQgI2YgImh0dHA6Ly9sb2NhbGhvc3Q6fmEvIiBwb3J0 KSkKICAgICAgICAgICAgICAgKGl0ZW0gICAgIChhZGQtdGV4dC10by1zdG9yZSAlc3RvcmUgInJh bmRvbSIgKHJhbmRvbS10ZXh0KSkpCiAgICAgICAgICAgICAgIChwYXJ0ICAgICAoc3RvcmUtcGF0 aC1oYXNoLXBhcnQgaXRlbSkpCiAgICAgICAgICAgICAgICh1cmwgICAgICAoc3RyaW5nLWFwcGVu ZCBiYXNlIHBhcnQgIi5uYXJpbmZvIikpCkBAIC02MDIsOSArNjA4LDkgQEAgUmVmZXJlbmNlczog fiUiCiAgIDIwMAogICAoY2FsbC13aXRoLXRlbXBvcmFyeS1kaXJlY3RvcnkKICAgIChsYW1iZGEg KGNhY2hlKQotICAgICAod2l0aC1ndWl4LXB1Ymxpc2ggNjc4OCBgKCItQyIgImd6aXAiICItQyIg Imd6aXAiCisgICAgICh3aXRoLWd1aXgtcHVibGlzaCBwb3J0IGAoIi1DIiAiZ3ppcCIgIi1DIiAi Z3ppcCIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAsKHN0cmluZy1hcHBlbmQgIi0t Y2FjaGU9IiBjYWNoZSkpCi0gICAgICAgKGxldCogKChiYXNlICAgICAiaHR0cDovL2xvY2FsaG9z dDo2Nzg4LyIpCisgICAgICAgKGxldCogKChiYXNlICAgICAoZm9ybWF0ICNmICJodHRwOi8vbG9j YWxob3N0On5hLyIgcG9ydCkpCiAgICAgICAgICAgICAgIChpdGVtICAgICAoYWRkLXRleHQtdG8t c3RvcmUgJXN0b3JlICJyYW5kb20iIChyYW5kb20tdGV4dCkpKQogICAgICAgICAgICAgICAocGFy dCAgICAgKHN0b3JlLXBhdGgtaGFzaC1wYXJ0IGl0ZW0pKQogICAgICAgICAgICAgICAobmFyaW5m byAgKHN0cmluZy1hcHBlbmQgYmFzZSBwYXJ0ICIubmFyaW5mbyIpKQpAQCAtNjMzLDkgKzYzOSw5 IEBAIFJlZmVyZW5jZXM6IH4lIgogICA7OyBmb3IgYSBub24tZXhpc3RpbmcgZmlsZSBuYW1lLgog ICAoY2FsbC13aXRoLXRlbXBvcmFyeS1kaXJlY3RvcnkKICAgIChsYW1iZGEgKGNhY2hlKQotICAg ICAod2l0aC1ndWl4LXB1Ymxpc2ggNjc4NyBgKCItQyIgImd6aXAiICwoc3RyaW5nLWFwcGVuZCAi LS1jYWNoZT0iIGNhY2hlKSkKKyAgICAgKHdpdGgtZ3VpeC1wdWJsaXNoIHBvcnQgYCgiLUMiICJn emlwIiAsKHN0cmluZy1hcHBlbmQgIi0tY2FjaGU9IiBjYWNoZSkpCiAKLSAgICAgICAobGV0KiAo KGJhc2UgICAgICJodHRwOi8vbG9jYWxob3N0OjY3ODcvIikKKyAgICAgICAobGV0KiAoKGJhc2Ug ICAgIChmb3JtYXQgI2YgImh0dHA6Ly9sb2NhbGhvc3Q6fmEvIiBwb3J0KSkKICAgICAgICAgICAg ICAgKGl0ZW0gICAgIChhZGQtdGV4dC10by1zdG9yZSAlc3RvcmUgInJhbmRvbSIgKHJhbmRvbS10 ZXh0KSkpCiAgICAgICAgICAgICAgIChwYXJ0ICAgICAoc3RvcmUtcGF0aC1oYXNoLXBhcnQgaXRl bSkpCiAgICAgICAgICAgICAgIChuYXJpbmZvICAoc3RyaW5nLWFwcGVuZCBiYXNlIHBhcnQgIi5u YXJpbmZvIikpCi0tIAoyLjMwLjAKCg== --=-KHF69gdnvOhvUmkdrndt-- --=-RB5khHq839Jrf/8EBOqD Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYIADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYBcozBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7kCtAP4u9nNFJUrU5C6t7Y70INXEryG/ aUMKVukepETKtb6rlgEAzj5w59Rzy6kPum+h6aJgcUj2cmw0pRviXRYGDf5JqgU= =Sk1E -----END PGP SIGNATURE----- --=-RB5khHq839Jrf/8EBOqD-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 31 17:11:01 2021 Received: (at 46216) by debbugs.gnu.org; 31 Jan 2021 22:11:01 +0000 Received: from localhost ([127.0.0.1]:58271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Kvt-0001VU-5x for submit@debbugs.gnu.org; Sun, 31 Jan 2021 17:11:01 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:39226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Kvq-0001VL-VV for 46216@debbugs.gnu.org; Sun, 31 Jan 2021 17:11:00 -0500 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id PaAx240080mfAB406aAxS1; Sun, 31 Jan 2021 23:10:57 +0100 Message-ID: <718d794296d6f47d127f88e77f39e9386b2185d4.camel@telenet.be> Subject: Fwd: Re: [PATCH] Remove duplication in tests/publish.scm From: Maxime Devos To: 46216@debbugs.gnu.org Date: Sun, 31 Jan 2021 23:10:57 +0100 References: <077d7e5c5e6935fce1e816784a03e55eb274dc50.camel@telenet.be> Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-kexNOvMa13TY2qcDWEhE" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1612131057; bh=tQxcmDfxotl5yjwo8FEq+Hg/1NZEdK6rlGRB52kLfv4=; h=Subject:From:Reply-To:To:Date:References; b=Bt2V0TnRvFZcxt3+lVfhetSAAmDJHjpnNW2laHAqi25bVWh27eowljVJ/hE+1lJEq /xa8t42L3p8AM1XSB4nqVU75INamwrFuG5iSur6ucnoxp2Zrm7tZ4m+ant/V4Iv+is JHAL3/97FnirInUEhrwmwOqWbHlh8ztNAMbBcQXMmOpGyxov/9+nFyCRKbtWjqAT6C csepUyU/bwI72JfXomxodapIvtGfpP+bCd0QfOJcmvh7bsF7LwqWSiRH8S0FaUdGAA TLQC8SH3XZtsAEAwJDaDsyDm5p1L4BGbCXrCNDVxqPTPuJzrNky6pA8SDwNfsnxR0Z sDRweN7YZNt/w== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 46216 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 46216@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-kexNOvMa13TY2qcDWEhE Content-Type: multipart/mixed; boundary="=-J/r0/u3TVoLcsdkzNb6W" --=-J/r0/u3TVoLcsdkzNb6W Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable I accidentally sent this to guix-patches instead of 46216@debbugs.gnu.org. -------- Forwarded Message -------- From: Maxime Devos Reply-To: 46216@debbugs.gnu.org To: guix-patches@gnu.org Subject: Re: [PATCH] Remove duplication in tests/publish.scm Date: Sun, 31 Jan 2021 23:01:48 +0100 This is the third patch in the series. Description from patch: This way, there's no risk of accidentally reusing a port number used by another test. This changes the workings of the "/*.narinfo for a compressed file" test a little, by not reusing the port from the test "/*.narinfo with compression". * tests/publish.scm (*latest-port*, call-with-guix-publish, with-guix-publish): automatically assign port numbers, and change tests to use the new calling rules. --=-J/r0/u3TVoLcsdkzNb6W Content-Disposition: attachment; filename*0=0003-tests-publish-automatically-keep-track-of-port-numbe.pat; filename*1=ch Content-Type: text/x-patch; name="0003-tests-publish-automatically-keep-track-of-port-numbe.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAzNTQ4YmU5Y2I3Yjg2MmIwNGRlZmFkMDgwYTgwYzg1MzExNDc1YzA2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IFN1biwgMzEgSmFuIDIwMjEgMjI6NTM6MDQgKzAxMDAKU3ViamVjdDogW1BBVENIIDMv M10gdGVzdHM6IHB1Ymxpc2g6IGF1dG9tYXRpY2FsbHkga2VlcCB0cmFjayBvZiBwb3J0IG51bWJl cnMKClRoaXMgd2F5LCB0aGVyZSdzIG5vIHJpc2sgb2YgYWNjaWRlbnRhbGx5IHJldXNpbmcgYQpw b3J0IG51bWJlciB1c2VkIGJ5IGFub3RoZXIgdGVzdC4gIFRoaXMgY2hhbmdlcyB0aGUKd29ya2lu Z3Mgb2YgdGhlICIvKi5uYXJpbmZvIGZvciBhIGNvbXByZXNzZWQgZmlsZSIgdGVzdAphIGxpdHRs ZSwgYnkgbm90IHJldXNpbmcgdGhlIHBvcnQgZnJvbSB0aGUgdGVzdAoiLyoubmFyaW5mbyB3aXRo IGNvbXByZXNzaW9uIi4KCiogdGVzdHMvcHVibGlzaC5zY20KICAoKmxhdGVzdC1wb3J0KiwgY2Fs bC13aXRoLWd1aXgtcHVibGlzaCwgd2l0aC1ndWl4LXB1Ymxpc2gpOgogIGF1dG9tYXRpY2FsbHkg YXNzaWduIHBvcnQgbnVtYmVycywgYW5kIGNoYW5nZSB0ZXN0cyB0bwogIHVzZSB0aGUgbmV3IGNh bGxpbmcgcnVsZXMuCi0tLQogdGVzdHMvcHVibGlzaC5zY20gfCA4NCArKysrKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ1IGluc2Vy dGlvbnMoKyksIDM5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL3B1Ymxpc2guc2Nt IGIvdGVzdHMvcHVibGlzaC5zY20KaW5kZXggZTI0YjBmZWIwMC4uMGExMzJkZmUwNCAxMDA2NDQK LS0tIGEvdGVzdHMvcHVibGlzaC5zY20KKysrIGIvdGVzdHMvcHVibGlzaC5zY20KQEAgLTEwNiwx NyArMTA2LDIzIEBAIFRoZSByZXN1bHRpbmcgdGhyZWFkIGlzIHJldHVybmVkLiIKICAgICAobGFt YmRhICgpCiAgICAgICAoYXBwbHkgZ3VpeC1wdWJsaXNoIChmb3JtYXQgI2YgIi0tcG9ydD1+YSIg cG9ydCkgZXh0cmEtYXJndW1lbnRzKSkpKSkKIAotKGRlZmluZSAoY2FsbC13aXRoLWd1aXgtcHVi bGlzaCBwb3J0IGV4dHJhLWFyZ3VtZW50cyB0aHVuaykKLSAgIkNhbGwgVEhVTksgaW4gYW4gZW52 aXJvbm1lbnQgd2hlcmUgYSBsb2NhbCBwdWJsaXNoaW5nIHNlcnZpY2UKLWlzIHJ1bm5pbmcgaW4g YSBzZXBhcmF0ZSB0aHJlYWQsIGxpc3RlbmluZyBhdCBQT1JULiAgRVhUUkEtQVJHVU1FTlRTCi1h cmUgcGFzc2VkIGFzLWlzIGFzIGV4dHJhIGNvbW1hbmQtbGluZSBhcmd1bWVudHMuIgotICAobGV0 ICgodGhyZWFkIChhcHBseSBzcGF3bi1ndWl4LXB1Ymxpc2ggcG9ydCBleHRyYS1hcmd1bWVudHMp KSkKKzs7IEtlZXAgdHJhY2sgb2YgcG9ydCBudW1iZXJzLCB0byBhdm9pZCBtdWx0aXBsZQorOzsg c2VydmVycyBsaXN0ZW5pbmcgYXQgdGhlIHNhbWUgcG9ydC4KKyhkZWZpbmUgKmxhdGVzdC1wb3J0 KiA2Nzg5KQorCisoZGVmaW5lIChjYWxsLXdpdGgtZ3VpeC1wdWJsaXNoIGV4dHJhLWFyZ3VtZW50 cyBwcm9jKQorICAiQ2FsbCBQUk9DIGluIGFuIGVudmlyb25tZW50IHdoZXJlIGEgbG9jYWwgcHVi bGlzaGluZyBzZXJ2aWNlCitpcyBydW5uaW5nIGluIGEgc2VwYXJhdGUgdGhyZWFkLCBwYXNzaW5n IHRoZSBwb3J0IGxpc3RlbmVkIGF0LgorRVhUUkEtQVJHVU1FTlRTIGFyZSBwYXNzZWQgYXMtaXMg YXMgZXh0cmEgY29tbWFuZC1saW5lIGFyZ3VtZW50cy4iCisgIChsZXQqICgocG9ydCAoMSsgKmxh dGVzdC1wb3J0KikpCisgICAgICAgICAodGhyZWFkIChhcHBseSBzcGF3bi1ndWl4LXB1Ymxpc2gg cG9ydCBleHRyYS1hcmd1bWVudHMpKSkKKyAgICAoc2V0ISAqbGF0ZXN0LXBvcnQqIHBvcnQpCiAg ICAgKHdhaXQtdW50aWwtcmVhZHkgcG9ydCkKLSAgICAodGh1bmspKSkKKyAgICAocHJvYyBwb3J0 KSkpCiAKIChkZWZpbmUtc3ludGF4LXJ1bGUgKHdpdGgtZ3VpeC1wdWJsaXNoIHBvcnQgZXh0cmEt YXJndW1lbnRzIGV4cCAuLi4pCi0gIChjYWxsLXdpdGgtZ3VpeC1wdWJsaXNoIHBvcnQgZXh0cmEt YXJndW1lbnRzCi0gICAgKGxhbWJkYSAoKSBleHAgLi4uKSkpCisgIChjYWxsLXdpdGgtZ3VpeC1w dWJsaXNoIGV4dHJhLWFyZ3VtZW50cworICAgIChsYW1iZGEgKHBvcnQpIGV4cCAuLi4pKSkKIAog KHNwYXduLWd1aXgtcHVibGlzaCA2Nzg5ICItQzAiKQogCkBAIC0yNzksOSArMjg1LDkgQEAgUmVm ZXJlbmNlczogfiUiCiAgIGAoKCJTdG9yZVBhdGgiIC4gLCVpdGVtKQogICAgICgiVVJMIiAuICwo c3RyaW5nLWFwcGVuZCAibmFyL2d6aXAvIiAoYmFzZW5hbWUgJWl0ZW0pKSkKICAgICAoIkNvbXBy ZXNzaW9uIiAuICJnemlwIikpCi0gICh3aXRoLWd1aXgtcHVibGlzaCA2Nzk5ICcoIi1DNSIpCi0g ICAgKGxldCogKCh1cmwgIChzdHJpbmctYXBwZW5kICJodHRwOi8vbG9jYWxob3N0OjY3OTkvIgot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RvcmUtcGF0aC1oYXNoLXBhcnQgJWl0 ZW0pICIubmFyaW5mbyIpKQorICAod2l0aC1ndWl4LXB1Ymxpc2ggcG9ydCAnKCItQzUiKQorICAg IChsZXQqICgodXJsICAoZm9ybWF0ICNmICJodHRwOi8vbG9jYWxob3N0On5hL35hLm5hcmluZm8i IHBvcnQKKyAgICAgICAgICAgICAgICAgICAgICAgICAoc3RvcmUtcGF0aC1oYXNoLXBhcnQgJWl0 ZW0pKSkKICAgICAgICAgICAgKGJvZHkgKGh0dHAtZ2V0LXBvcnQgdXJsKSkpCiAgICAgICAoZmls dGVyIChsYW1iZGEgKGl0ZW0pCiAgICAgICAgICAgICAgICAgKG1hdGNoIGl0ZW0KQEAgLTI5NSw5 ICszMDEsOSBAQCBSZWZlcmVuY2VzOiB+JSIKICAgYCgoIlN0b3JlUGF0aCIgLiAsJWl0ZW0pCiAg ICAgKCJVUkwiIC4gLChzdHJpbmctYXBwZW5kICJuYXIvbHppcC8iIChiYXNlbmFtZSAlaXRlbSkp KQogICAgICgiQ29tcHJlc3Npb24iIC4gImx6aXAiKSkKLSAgKHdpdGgtZ3VpeC1wdWJsaXNoIDY3 OTAgJygiLUNsemlwIikKLSAgICAobGV0KiAoKHVybCAgKHN0cmluZy1hcHBlbmQgImh0dHA6Ly9s b2NhbGhvc3Q6Njc5MC8iCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdG9yZS1w YXRoLWhhc2gtcGFydCAlaXRlbSkgIi5uYXJpbmZvIikpCisgICh3aXRoLWd1aXgtcHVibGlzaCBw b3J0ICcoIi1DbHppcCIpCisgICAgKGxldCogKCh1cmwgIChmb3JtYXQgI2YgImh0dHA6Ly9sb2Nh bGhvc3Q6fmEvfmEubmFyaW5mbyIgcG9ydAorICAgICAgICAgICAgICAgICAgICAgICAgIChzdG9y ZS1wYXRoLWhhc2gtcGFydCAlaXRlbSkpKQogICAgICAgICAgICAoYm9keSAoaHR0cC1nZXQtcG9y dCB1cmwpKSkKICAgICAgIChmaWx0ZXIgKGxhbWJkYSAoaXRlbSkKICAgICAgICAgICAgICAgICAo bWF0Y2ggaXRlbQpAQCAtMzA5LDE1ICszMTUsMTUgQEAgUmVmZXJlbmNlczogfiUiCiAKICh0ZXN0 LWVxdWFsICIvKi5uYXJpbmZvIGZvciBhIGNvbXByZXNzZWQgZmlsZSIKICAgJygibm9uZSIgIm5h ciIpICAgICAgICAgIDtjb21wcmVzc2lvbi1sZXNzIG5hcgotICA7OyBBc3N1bWUgJ2d1aXggcHVi bGlzaCAtQycgaXMgYWxyZWFkeSBydW5uaW5nIG9uIHBvcnQgNjc5OS4KLSAgKGxldCogKChpdGVt IChhZGQtdGV4dC10by1zdG9yZSAlc3RvcmUgImZha2UudGFyLmd6IgotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICJUaGlzIGlzIGEgZmFrZSBjb21wcmVzc2VkIGZpbGUuIikpCi0g ICAgICAgICAodXJsICAoc3RyaW5nLWFwcGVuZCAiaHR0cDovL2xvY2FsaG9zdDo2Nzk5LyIKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdG9yZS1wYXRoLWhhc2gtcGFydCBpdGVtKSAi Lm5hcmluZm8iKSkKLSAgICAgICAgIChib2R5IChodHRwLWdldC1wb3J0IHVybCkpCi0gICAgICAg ICAoaW5mbyAocmVjdXRpbHMtPmFsaXN0IGJvZHkpKSkKLSAgICAobGlzdCAoYXNzb2MtcmVmIGlu Zm8gIkNvbXByZXNzaW9uIikKLSAgICAgICAgICAoZGlybmFtZSAoYXNzb2MtcmVmIGluZm8gIlVS TCIpKSkpKQorICAod2l0aC1ndWl4LXB1Ymxpc2ggcG9ydCAnKCItQzUiKQorICAgIChsZXQqICgo aXRlbSAoYWRkLXRleHQtdG8tc3RvcmUgJXN0b3JlICJmYWtlLnRhci5neiIKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICJUaGlzIGlzIGEgZmFrZSBjb21wcmVzc2VkIGZpbGUu IikpCisgICAgICAgICAgICh1cmwgIChmb3JtYXQgI2YgImh0dHA6Ly9sb2NhbGhvc3Q6fmEvfmEu bmFyaW5mbyIgcG9ydAorICAgICAgICAgICAgICAgICAgICAgICAgIChzdG9yZS1wYXRoLWhhc2gt cGFydCBpdGVtKSkpCisgICAgICAgICAgIChib2R5IChodHRwLWdldC1wb3J0IHVybCkpCisgICAg ICAgICAgIChpbmZvIChyZWN1dGlscy0+YWxpc3QgYm9keSkpKQorICAgICAgKGxpc3QgKGFzc29j LXJlZiBpbmZvICJDb21wcmVzc2lvbiIpCisgICAgICAgICAgICAoZGlybmFtZSAoYXNzb2MtcmVm IGluZm8gIlVSTCIpKSkpKSkKIAogKHRlc3QtZXF1YWwgIi8qLm5hcmluZm8gd2l0aCBsemlwICsg Z3ppcCIKICAgYCgoKCJTdG9yZVBhdGgiIC4gLCVpdGVtKQpAQCAtMzI5LDggKzMzNSw4IEBAIFJl ZmVyZW5jZXM6IH4lIgogICAgIDIwMCkKICAgKGNhbGwtd2l0aC10ZW1wb3JhcnktZGlyZWN0b3J5 CiAgICAobGFtYmRhIChjYWNoZSkKLSAgICAgKHdpdGgtZ3VpeC1wdWJsaXNoIDY3OTMgJygiLUNn emlwOjIiICItQ2x6aXA6MiIpCi0gICAgICAgKGxldCogKChiYXNlICJodHRwOi8vbG9jYWxob3N0 OjY3OTMvIikKKyAgICAgKHdpdGgtZ3VpeC1wdWJsaXNoIHBvcnQgJygiLUNnemlwOjIiICItQ2x6 aXA6MiIpCisgICAgICAgKGxldCogKChiYXNlIChmb3JtYXQgI2YgImh0dHA6Ly9sb2NhbGhvc3Q6 fmEvIiBwb3J0KSkKICAgICAgICAgICAgICAgKHBhcnQgKHN0b3JlLXBhdGgtaGFzaC1wYXJ0ICVp dGVtKSkKICAgICAgICAgICAgICAgKHVybCAgKHN0cmluZy1hcHBlbmQgYmFzZSBwYXJ0ICIubmFy aW5mbyIpKQogICAgICAgICAgICAgICAoYm9keSAoaHR0cC1nZXQtcG9ydCB1cmwpKSkKQEAgLTM0 OSw4ICszNTUsOCBAQCBSZWZlcmVuY2VzOiB+JSIKICAgICAgICAgICAoIkNvbXByZXNzaW9uIiAu ICJub25lIikpCiAgICAgICAgIDIwMAogICAgICAgICA0MDQpCi0gICh3aXRoLWd1aXgtcHVibGlz aCA2Nzk4ICcoIi1DMCIgIi0tbmFyLXBhdGg9Ly8vZm9vL2Jhci8vY2hib3VpYi8iKQotICAgIChs ZXQqICgoYmFzZSAgICAiaHR0cDovL2xvY2FsaG9zdDo2Nzk4LyIpCisgICh3aXRoLWd1aXgtcHVi bGlzaCBwb3J0ICcoIi1DMCIgIi0tbmFyLXBhdGg9Ly8vZm9vL2Jhci8vY2hib3VpYi8iKQorICAg IChsZXQqICgoYmFzZSAgICAoZm9ybWF0ICNmICJodHRwOi8vbG9jYWxob3N0On5hLyIgcG9ydCkp CiAgICAgICAgICAgIChwYXJ0ICAgIChzdG9yZS1wYXRoLWhhc2gtcGFydCAlaXRlbSkpCiAgICAg ICAgICAgICh1cmwgICAgIChzdHJpbmctYXBwZW5kIGJhc2UgcGFydCAiLm5hcmluZm8iKSkKICAg ICAgICAgICAgKG5hci11cmwgKHN0cmluZy1hcHBlbmQgYmFzZSAiZm9vL2Jhci9jaGJvdWliLyIK QEAgLTQzMCw5ICs0MzYsOSBAQCBSZWZlcmVuY2VzOiB+JSIKICAgICAgICAgNDA0KSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgO25hci/igKYKICAgKGNhbGwtd2l0aC10ZW1w b3JhcnktZGlyZWN0b3J5CiAgICAobGFtYmRhIChjYWNoZSkKLSAgICAgKHdpdGgtZ3VpeC1wdWJs aXNoIDY3OTcgYCgiLUMyIiAsKHN0cmluZy1hcHBlbmQgIi0tY2FjaGU9IiBjYWNoZSkKKyAgICAg KHdpdGgtZ3VpeC1wdWJsaXNoIHBvcnQgYCgiLUMyIiAsKHN0cmluZy1hcHBlbmQgIi0tY2FjaGU9 IiBjYWNoZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1jYWNoZS1ieXBhc3Mt dGhyZXNob2xkPTAiKQotICAgICAgIChsZXQqICgoYmFzZSAgICAgImh0dHA6Ly9sb2NhbGhvc3Q6 Njc5Ny8iKQorICAgICAgIChsZXQqICgoYmFzZSAgICAgKGZvcm1hdCAjZiAiaHR0cDovL2xvY2Fs aG9zdDp+YS8iIHBvcnQpKQogICAgICAgICAgICAgICAocGFydCAgICAgKHN0b3JlLXBhdGgtaGFz aC1wYXJ0ICVpdGVtKSkKICAgICAgICAgICAgICAgKHVybCAgICAgIChzdHJpbmctYXBwZW5kIGJh c2UgcGFydCAiLm5hcmluZm8iKSkKICAgICAgICAgICAgICAgKG5hci11cmwgIChzdHJpbmctYXBw ZW5kIGJhc2UgIm5hci9nemlwLyIgKGJhc2VuYW1lICVpdGVtKSkpCkBAIC00ODAsMTAgKzQ4Niwx MCBAQCBSZWZlcmVuY2VzOiB+JSIKICAgJygyMDAgMjAwIDQwNCkKICAgKGNhbGwtd2l0aC10ZW1w b3JhcnktZGlyZWN0b3J5CiAgICAobGFtYmRhIChjYWNoZSkKLSAgICAgKHdpdGgtZ3VpeC1wdWJs aXNoIDY3OTQgYCgiLUNnemlwOjIiICItQ2x6aXA6MiIKKyAgICAgKHdpdGgtZ3VpeC1wdWJsaXNo IHBvcnQgYCgiLUNnemlwOjIiICItQ2x6aXA6MiIKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAsKHN0cmluZy1hcHBlbmQgIi0tY2FjaGU9IiBjYWNoZSkKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiLS1jYWNoZS1ieXBhc3MtdGhyZXNob2xkPTAiKQotICAgICAgIChsZXQq ICgoYmFzZSAgICAgImh0dHA6Ly9sb2NhbGhvc3Q6Njc5NC8iKQorICAgICAgIChsZXQqICgoYmFz ZSAgICAgKGZvcm1hdCAjZiAiaHR0cDovL2xvY2FsaG9zdDp+YS8iIHBvcnQpKQogICAgICAgICAg ICAgICAocGFydCAgICAgKHN0b3JlLXBhdGgtaGFzaC1wYXJ0ICVpdGVtKSkKICAgICAgICAgICAg ICAgKHVybCAgICAgIChzdHJpbmctYXBwZW5kIGJhc2UgcGFydCAiLm5hcmluZm8iKSkKICAgICAg ICAgICAgICAgKG5hci11cmwgIChjdXRlIHN0cmluZy1hcHBlbmQgIm5hci8iIDw+ICIvIgpAQCAt NTMyLDEwICs1MzgsMTAgQEAgUmVmZXJlbmNlczogfiUiCiAgICAgICAgICAgNDA0KSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDtuYXIvZ3ppcC/igKYKICAgICAoY2FsbC13aXRo LXRlbXBvcmFyeS1kaXJlY3RvcnkKICAgICAgKGxhbWJkYSAoY2FjaGUpCi0gICAgICAgKHdpdGgt Z3VpeC1wdWJsaXNoIDY3OTYgYCgiLUMyIiAiLS10dGw9NDJoIgorICAgICAgICh3aXRoLWd1aXgt cHVibGlzaCBwb3J0IGAoIi1DMiIgIi0tdHRsPTQyaCIKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICwoc3RyaW5nLWFwcGVuZCAiLS1jYWNoZT0iIGNhY2hlKQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIi0tY2FjaGUtYnlwYXNzLXRocmVzaG9sZD0wIikKLSAgICAg ICAgIChsZXQqICgoYmFzZSAgICAgImh0dHA6Ly9sb2NhbGhvc3Q6Njc5Ni8iKQorICAgICAgICAg KGxldCogKChiYXNlICAgICAoZm9ybWF0ICNmICJodHRwOi8vbG9jYWxob3N0On5hLyIgcG9ydCkp CiAgICAgICAgICAgICAgICAgKHBhcnQgICAgIChzdG9yZS1wYXRoLWhhc2gtcGFydCBpdGVtKSkK ICAgICAgICAgICAgICAgICAodXJsICAgICAgKHN0cmluZy1hcHBlbmQgYmFzZSBwYXJ0ICIubmFy aW5mbyIpKQogICAgICAgICAgICAgICAgIChjYWNoZWQgICAoc3RyaW5nLWFwcGVuZCBjYWNoZSAi L25vbmUvIgpAQCAtNTgwLDExICs1ODYsMTEgQEAgUmVmZXJlbmNlczogfiUiCiAgIDIwMAogICAo Y2FsbC13aXRoLXRlbXBvcmFyeS1kaXJlY3RvcnkKICAgIChsYW1iZGEgKGNhY2hlKQotICAgICAo d2l0aC1ndWl4LXB1Ymxpc2ggNjc5NSAobGlzdCAoc3RyaW5nLWFwcGVuZCAiLS1jYWNoZT0iIGNh Y2hlKSkKKyAgICAgKHdpdGgtZ3VpeC1wdWJsaXNoIHBvcnQgKGxpc3QgKHN0cmluZy1hcHBlbmQg Ii0tY2FjaGU9IiBjYWNoZSkpCiAKICAgICAgICA7OyBNYWtlIHN1cmUgdGhhdCwgZXZlbiBpZiBJ VEVNIGRpc2FwcGVhcnMsIHdlJ3JlIHN0aWxsIGFibGUgdG8gZmV0Y2gKICAgICAgICA7OyBpdC4K LSAgICAgICAobGV0KiAoKGJhc2UgICAgICJodHRwOi8vbG9jYWxob3N0OjY3OTUvIikKKyAgICAg ICAobGV0KiAoKGJhc2UgICAgIChmb3JtYXQgI2YgImh0dHA6Ly9sb2NhbGhvc3Q6fmEvIiBwb3J0 KSkKICAgICAgICAgICAgICAgKGl0ZW0gICAgIChhZGQtdGV4dC10by1zdG9yZSAlc3RvcmUgInJh bmRvbSIgKHJhbmRvbS10ZXh0KSkpCiAgICAgICAgICAgICAgIChwYXJ0ICAgICAoc3RvcmUtcGF0 aC1oYXNoLXBhcnQgaXRlbSkpCiAgICAgICAgICAgICAgICh1cmwgICAgICAoc3RyaW5nLWFwcGVu ZCBiYXNlIHBhcnQgIi5uYXJpbmZvIikpCkBAIC02MDIsOSArNjA4LDkgQEAgUmVmZXJlbmNlczog fiUiCiAgIDIwMAogICAoY2FsbC13aXRoLXRlbXBvcmFyeS1kaXJlY3RvcnkKICAgIChsYW1iZGEg KGNhY2hlKQotICAgICAod2l0aC1ndWl4LXB1Ymxpc2ggNjc4OCBgKCItQyIgImd6aXAiICItQyIg Imd6aXAiCisgICAgICh3aXRoLWd1aXgtcHVibGlzaCBwb3J0IGAoIi1DIiAiZ3ppcCIgIi1DIiAi Z3ppcCIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAsKHN0cmluZy1hcHBlbmQgIi0t Y2FjaGU9IiBjYWNoZSkpCi0gICAgICAgKGxldCogKChiYXNlICAgICAiaHR0cDovL2xvY2FsaG9z dDo2Nzg4LyIpCisgICAgICAgKGxldCogKChiYXNlICAgICAoZm9ybWF0ICNmICJodHRwOi8vbG9j YWxob3N0On5hLyIgcG9ydCkpCiAgICAgICAgICAgICAgIChpdGVtICAgICAoYWRkLXRleHQtdG8t c3RvcmUgJXN0b3JlICJyYW5kb20iIChyYW5kb20tdGV4dCkpKQogICAgICAgICAgICAgICAocGFy dCAgICAgKHN0b3JlLXBhdGgtaGFzaC1wYXJ0IGl0ZW0pKQogICAgICAgICAgICAgICAobmFyaW5m byAgKHN0cmluZy1hcHBlbmQgYmFzZSBwYXJ0ICIubmFyaW5mbyIpKQpAQCAtNjMzLDkgKzYzOSw5 IEBAIFJlZmVyZW5jZXM6IH4lIgogICA7OyBmb3IgYSBub24tZXhpc3RpbmcgZmlsZSBuYW1lLgog ICAoY2FsbC13aXRoLXRlbXBvcmFyeS1kaXJlY3RvcnkKICAgIChsYW1iZGEgKGNhY2hlKQotICAg ICAod2l0aC1ndWl4LXB1Ymxpc2ggNjc4NyBgKCItQyIgImd6aXAiICwoc3RyaW5nLWFwcGVuZCAi LS1jYWNoZT0iIGNhY2hlKSkKKyAgICAgKHdpdGgtZ3VpeC1wdWJsaXNoIHBvcnQgYCgiLUMiICJn emlwIiAsKHN0cmluZy1hcHBlbmQgIi0tY2FjaGU9IiBjYWNoZSkpCiAKLSAgICAgICAobGV0KiAo KGJhc2UgICAgICJodHRwOi8vbG9jYWxob3N0OjY3ODcvIikKKyAgICAgICAobGV0KiAoKGJhc2Ug ICAgIChmb3JtYXQgI2YgImh0dHA6Ly9sb2NhbGhvc3Q6fmEvIiBwb3J0KSkKICAgICAgICAgICAg ICAgKGl0ZW0gICAgIChhZGQtdGV4dC10by1zdG9yZSAlc3RvcmUgInJhbmRvbSIgKHJhbmRvbS10 ZXh0KSkpCiAgICAgICAgICAgICAgIChwYXJ0ICAgICAoc3RvcmUtcGF0aC1oYXNoLXBhcnQgaXRl bSkpCiAgICAgICAgICAgICAgIChuYXJpbmZvICAoc3RyaW5nLWFwcGVuZCBiYXNlIHBhcnQgIi5u YXJpbmZvIikpCi0tIAoyLjMwLjAKCg== --=-J/r0/u3TVoLcsdkzNb6W-- --=-kexNOvMa13TY2qcDWEhE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYIADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYBcq8RccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7odfAP9IA3ToqVWaI5cuS2qrrffb6PwY PHj3+EQqTf+5fsiXDgD/VRrpvOuet8iszrG5D7L7zp0ONG/EPXmyUFDvOR8DPAo= =5Ky+ -----END PGP SIGNATURE----- --=-kexNOvMa13TY2qcDWEhE-- From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 01 09:05:36 2021 Received: (at 46216) by debbugs.gnu.org; 1 Feb 2021 14:05:36 +0000 Received: from localhost ([127.0.0.1]:59413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Zpf-0004jD-KU for submit@debbugs.gnu.org; Mon, 01 Feb 2021 09:05:36 -0500 Received: from baptiste.telenet-ops.be ([195.130.132.51]:45028) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Zpc-0004j2-3T for 46216@debbugs.gnu.org; Mon, 01 Feb 2021 09:05:33 -0500 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id Pq5W2400A0mfAB401q5WbT; Mon, 01 Feb 2021 15:05:30 +0100 Message-ID: <92135424cd296e2e02f4f58a638da5cc6dcc1667.camel@telenet.be> Subject: [PATCH] Remove duplication in tests/publish.scm From: Maxime Devos To: 46216@debbugs.gnu.org Date: Mon, 01 Feb 2021 15:04:16 +0100 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-TVwt4zRyKrV7bOBx8CVc" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1612188330; bh=VEPHxdttsi5zZlN/yzlN4Lmxx3+HcL0yahP9IZsn6Ts=; h=Subject:From:Reply-To:To:Date:In-Reply-To:References; b=FczjSY/iYV8Im5cj68WHAcS4GfwAJ4/IXNFAcUzQof2YqZYelybwGN9dd726LDrxD 0O6WDVbO7pgNhp/M3xrCoNGnvpj4rOqTl+ToIvY7HrXCPtBO0T/hlkih5Jaw/lx2gt gxWX3FQnCQRAFyJVb/eQU93fL/njxpwN2sOzhJZiIL3mv5JgHzxgDnxKUi9GHwEQnA 8M3erU23MYJMcRQ1QLWOSnlbHydnud+tvBBAnnqWHbLl1mcyBmpjSotd4cwwzpN3XM jOdVx27EYdsObYMemlSiGggqZEaL8aGTjpfgNKk0piMX7mixEEM+uNr+zQtZbApsGp lGT6x6w+R5ezA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 46216 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 46216@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-TVwt4zRyKrV7bOBx8CVc Content-Type: multipart/mixed; boundary="=-W7eLZHwmS4Gn2D9/uQbC" --=-W7eLZHwmS4Gn2D9/uQbC Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable This is the fourth patch in the series. It removes any explicit port numbers in the test. This may be useful for preventing some potential future problems with parallel "make check". Description from the commit message: > Subject: [PATCH 4/4] tests: publish: don't bind the test server to a port= . > > This way, multiple instances of 'make check TESTS=3Dtests/publish.scm' > can be run in parallel. Also, there's no risk of the ports used > in this test conflicting with ports assigned to system services > anymore. This also prevents any potential future conflicts > with ports used by other tests that would lead to nondeterministic > test failures when parallel tests are enabled. --=-W7eLZHwmS4Gn2D9/uQbC Content-Disposition: attachment; filename="0004-tests-publish-don-t-bind-the-test-server-to-a-port.patch" Content-Type: text/x-patch; name="0004-tests-publish-don-t-bind-the-test-server-to-a-port.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBlODhjODZhYzZjY2ZmZmNjNmZhNWYzY2JkMmQ1ZWM1MTc4NDIxNzYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ CkRhdGU6IE1vbiwgMSBGZWIgMjAyMSAxNDoyODowMyArMDEwMApTdWJqZWN0OiBbUEFUQ0ggNC80 XSB0ZXN0czogcHVibGlzaDogZG9uJ3QgYmluZCB0aGUgdGVzdCBzZXJ2ZXIgdG8gYSBwb3J0LgoK VGhpcyB3YXksIG11bHRpcGxlIGluc3RhbmNlcyBvZiAnbWFrZSBjaGVjayBURVNUUz10ZXN0cy9w dWJsaXNoLnNjbScKY2FuIGJlIHJ1biBpbiBwYXJhbGxlbC4gIEFsc28sIHRoZXJlJ3Mgbm8gcmlz ayBvZiB0aGUgcG9ydHMgdXNlZAppbiB0aGlzIHRlc3QgY29uZmxpY3Rpbmcgd2l0aCBwb3J0cyBh c3NpZ25lZCB0byBzeXN0ZW0gc2VydmljZXMKYW55bW9yZS4gIFRoaXMgYWxzbyBwcmV2ZW50cyBh bnkgcG90ZW50aWFsIGZ1dHVyZSBjb25mbGljdHMKd2l0aCBwb3J0cyB1c2VkIGJ5IG90aGVyIHRl c3RzIHRoYXQgd291bGQgbGVhZCB0byBub25kZXRlcm1pbmlzdGljCnRlc3QgZmFpbHVyZXMgd2hl biBwYXJhbGxlbCB0ZXN0cyBhcmUgZW5hYmxlZC4KCiogZ3VpeC9zY3JpcHRzL3B1Ymxpc2guc2Nt CiAgKHdoZW4tYm91bmQpOiBuZXcgcGFyYW1ldGVyIGZvciBjb21tdW5pY2F0aW5nIHdpdGgKICB0 ZXN0cy9wdWJsaXNoLnNjbS4KICAoZ3VpeC1wdWJsaXNoKTogaW5mb3JtIHRlc3RzL3B1Ymxpc2gu c2NtIGFib3V0IHRoZSBwb3J0CiAgdGhlIHNlcnZlciBzb2NrZXQgd2FzIGJvdW5kIHRvIHZpYSAn d2hlbi1ib3VuZCcuICBBbHNvCiAgY29ycmVjdGx5IGxvZyB0byB3aGljaCBwb3J0IHRoZSBzZXJ2 ZXIgd2FzIGJvdW5kLgoqIHRlc3RzL3B1Ymxpc2guc2NtCiAgKHNwYXduLWd1aXgtcHVibGlzaCk6 IHJlbW92ZSAncG9ydCcgYXJndW1lbnQsIGFzayAiZ3VpeCBwdWJsaXNoIgogIG5vdCB0byBleHBs aWNpdGVseSBiaW5kIHRoZSBzZXJ2ZXIgc29ja2V0IHRvIGEgcG9ydCBhbmQgYWRkIHRoZQogIHBv cnQgaXQgd2FzIGltcGxpY2l0ZWx5IGJvdW5kIHRvLCB0byB0aGUgcmV0dXJuIHZhbHVlcy4KICAo Y2FsbC13aXRoLWd1aXgtcHVibGlzaCk6IGFkanVzdCBjYWxsIHRvICdzcGF3bi1ndWl4LXB1Ymxp c2gnLgoKICBBbHNvIGFkanVzdCB0aGUgY29kZSB0byBzcGF3biB0aGUgZmlyc3Qgc2VydmVyIGFu ZCAncHVibGlzaC11cmknCiAgdG8gdGhlIG5ldyBzZW1hbnRpY3Mgb2YgJ3NwYXduLWd1aXgtcHVi bGlzaCcuCi0tLQogZ3VpeC9zY3JpcHRzL3B1Ymxpc2guc2NtIHwgMzQgKysrKysrKysrKysrKysr KysrKy0tLS0KIHRlc3RzL3B1Ymxpc2guc2NtICAgICAgICB8IDU4ICsrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNjMgaW5zZXJ0aW9ucygr KSwgMjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ3VpeC9zY3JpcHRzL3B1Ymxpc2guc2Nt IGIvZ3VpeC9zY3JpcHRzL3B1Ymxpc2guc2NtCmluZGV4IGZhODUwODhlZDAuLjQzMjMzYTRmZDAg MTAwNjQ0Ci0tLSBhL2d1aXgvc2NyaXB0cy9wdWJsaXNoLnNjbQorKysgYi9ndWl4L3NjcmlwdHMv cHVibGlzaC5zY20KQEAgLTMsNiArMyw3IEBACiA7OzsgQ29weXJpZ2h0IMKpIDIwMjAgYnkgQW1h ciBNLiBTaW5naCA8bmx5QGRpc3Jvb3Qub3JnPgogOzs7IENvcHlyaWdodCDCqSAyMDE1LCAyMDE2 LCAyMDE3LCAyMDE4LCAyMDE5LCAyMDIwIEx1ZG92aWMgQ291cnTDqHMgPGx1ZG9AZ251Lm9yZz4K IDs7OyBDb3B5cmlnaHQgwqkgMjAyMCBNYXhpbSBDb3Vybm95ZXIgPG1heGltLmNvdXJub3llckBn bWFpbC5jb20+Cis7OzsgQ29weXJpZ2h0IMKpIDIwMjEgTWF4aW1lIERldm9zIDxtYXhpbWVkZXZv c0B0ZWxlbmV0LmJlPgogOzs7CiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCiA7 OzsKQEAgLTc1LDcgKzc2LDkgQEAKICAgICAgICAgICAgIG9wZW4tc2VydmVyLXNvY2tldAogICAg ICAgICAgICAgcHVibGlzaC1zZXJ2aWNlLXR5cGUKICAgICAgICAgICAgIHJ1bi1wdWJsaXNoLXNl cnZlcgotICAgICAgICAgICAgZ3VpeC1wdWJsaXNoKSkKKyAgICAgICAgICAgIGd1aXgtcHVibGlz aAorCisgICAgICAgICAgICB3aGVuLWJvdW5kKSkKIAogKGRlZmluZSAoc2hvdy1oZWxwKQogICAo Zm9ybWF0ICN0IChHXyAiVXNhZ2U6IGd1aXggcHVibGlzaCBbT1BUSU9OXS4uLgpAQCAtMTE2LDYg KzExOSwxOSBAQCBQdWJsaXNoIH5hIG92ZXIgSFRUUC5cbiIpICVzdG9yZS1kaXJlY3RvcnkpCiAg IChuZXdsaW5lKQogICAoc2hvdy1idWctcmVwb3J0LWluZm9ybWF0aW9uKSkKIAorOzsgV2hlbiB0 ZXN0aW5nLCBpZGVhbGx5IHRoZSBzZXJ2ZXIgaXNuJ3QgZXhwbGljaXRseSBib3VuZCB0bworOzsg YW55IHBhcnRpY3VsYXIgcG9ydCwgdG8gYXZvaWQgY29uZmxpY3RzIHdpdGggb3RoZXIgc29mdHdh cmUsCis7OyBhbmQgdG8gYmUgYWJsZSAibWFrZSBjaGVjayIgbXVsdGlwbGUgR3VpeCBjaGVja291 dHMgaW4gcGFyYWxsZWwuCis7OworOzsgV2hpbGUgdGhlc2UgY29uZmxpY3RzIHdvbid0IGFwcGVh ciBpbiB0aGUgYnVpbGQgY29udGFpbmVyLAorOzsgdGhleSBjYW4gc3RpbGwgYmUgYW5ub3lpbmcg d2hlbiBhIGRldmVsb3BlciBpcyB0ZXN0aW5nCis7OyBzb21ldGhpbmcgKm91dHNpZGUqIGEgbmV0 d29yayBjb250YWluZXIuCis7OworOzsgV2hlbiB0aGlzIHBhcmFtZXRlcidzIHZhbHVlIGlzIG5v dCBmYWxzZSwgaXQgaXMgYSBwcm9jZWR1cmUKKzs7IGFjY2VwdGluZyB0aGUgcG9ydCBudW1iZXIg dGhlIHNlcnZlciB3YXMgKGltcGxpY2l0bHkpIGJvdW5kCis7OyB0byAoYnkgdGhlIGtlcm5lbCku CisoZGVmaW5lIHdoZW4tYm91bmQgKG1ha2UtcGFyYW1ldGVyICNmKSkKKwogKGRlZmluZSAoZ2V0 YWRkcmluZm8qIGhvc3QpCiAgICJMaWtlICdnZXRhZGRyaW5mbycsIGJ1dCBwcm9wZXJseSByZXBv cnQgZXJyb3JzLiIKICAgKGNhdGNoICdnZXRhZGRyaW5mby1lcnJvcgpAQCAtMTEyNSw3ICsxMTQx LDcgQEAgbWV0aG9kcywgcmV0dXJuIHRoZSBhcHBsaWNhYmxlIGNvbXByZXNzaW9uLiIKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJWRlZmF1bHQtb3B0aW9ucykpCiAgICAgICAgICAg IChhZHZlcnRpc2U/ICAoYXNzb2MtcmVmIG9wdHMgJ2FkdmVydGlzZT8pKQogICAgICAgICAgICAo dXNlciAgICAgICAgKGFzc29jLXJlZiBvcHRzICd1c2VyKSkKLSAgICAgICAgICAgKHBvcnQgICAg ICAgIChhc3NvYy1yZWYgb3B0cyAncG9ydCkpCisgICAgICAgICAgIChyZXF1ZXN0ZWQtcG9ydCAo YXNzb2MtcmVmIG9wdHMgJ3BvcnQpKQogICAgICAgICAgICAodHRsICAgICAgICAgKGFzc29jLXJl ZiBvcHRzICduYXJpbmZvLXR0bCkpCiAgICAgICAgICAgIChjb21wcmVzc2lvbnMgKG1hdGNoIChm aWx0ZXItbWFwIChtYXRjaC1sYW1iZGEKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAoKCdjb21wcmVzc2lvbiAuIGNvbXByZXNzaW9uKQpAQCAtMTEzOSw4ICsx MTU1LDEzIEBAIG1ldGhvZHMsIHJldHVybiB0aGUgYXBwbGljYWJsZSBjb21wcmVzc2lvbi4iCiAg ICAgICAgICAgIChhZGRyZXNzIChsZXQgKChhZGRyIChhc3NvYy1yZWYgb3B0cyAnYWRkcmVzcykp KQogICAgICAgICAgICAgICAgICAgICAgIChtYWtlLXNvY2tldC1hZGRyZXNzIChzb2NrYWRkcjpm YW0gYWRkcikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc29j a2FkZHI6YWRkciBhZGRyKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHBvcnQpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBy ZXF1ZXN0ZWQtcG9ydCkpKQogICAgICAgICAgICAoc29ja2V0ICAob3Blbi1zZXJ2ZXItc29ja2V0 IGFkZHJlc3MpKQorICAgICAgICAgICA7OyBJZiByZXF1ZXN0ZWQtcG9ydCA9IDAsIHRoZW4gdGhl IGtlcm5lbAorICAgICAgICAgICA7OyB3aWxsIGF1dG9tYXRpY2FsbHkgYXNzaWduIGEgZnJlZSBw b3J0IG51bWJlci4KKyAgICAgICAgICAgKHBvcnQgKGlmICg9IDAgcmVxdWVzdGVkLXBvcnQpCisg ICAgICAgICAgICAgICAgICAgICAoc29ja2FkZHI6cG9ydCAoZ2V0c29ja25hbWUgc29ja2V0KSkK KyAgICAgICAgICAgICAgICAgICAgIHJlcXVlc3RlZC1wb3J0KSkKICAgICAgICAgICAgKG5hci1w YXRoICAoYXNzb2MtcmVmIG9wdHMgJ25hci1wYXRoKSkKICAgICAgICAgICAgKHJlcGwtcG9ydCAo YXNzb2MtcmVmIG9wdHMgJ3JlcGwpKQogICAgICAgICAgICAoY2FjaGUgICAgIChhc3NvYy1yZWYg b3B0cyAnY2FjaGUpKQpAQCAtMTE1MSw2ICsxMTcyLDEwIEBAIG1ldGhvZHMsIHJldHVybiB0aGUg YXBwbGljYWJsZSBjb21wcmVzc2lvbi4iCiAgICAgICAgICAgIChwdWJsaWMta2V5ICAocmVhZC1m aWxlLXNleHAgKGFzc29jLXJlZiBvcHRzICdwdWJsaWMta2V5LWZpbGUpKSkKICAgICAgICAgICAg KHByaXZhdGUta2V5IChyZWFkLWZpbGUtc2V4cCAoYXNzb2MtcmVmIG9wdHMgJ3ByaXZhdGUta2V5 LWZpbGUpKSkpCiAKKyAgICAgIDs7IEluZm9ybSB0ZXN0cy9wdWJsaXNoLnNjbSBhYm91dCB0aGUg cG9ydCBudW1iZXIgdXNlZC4KKyAgICAgIChsZXQgKChwcm9jICh3aGVuLWJvdW5kKSkpCisgICAg ICAgICh3aGVuIHByb2MgKHByb2MgcG9ydCkpKQorCiAgICAgICAod2hlbiB1c2VyCiAgICAgICAg IDs7IE5vdyB0aGF0IHdlJ3ZlIHJlYWQgdGhlIGtleSBtYXRlcmlhbCBhbmQgb3BlbmVkIHRoZSBz b2NrZXQsIHdlIGNhbgogICAgICAgICA7OyBkcm9wIHByaXZpbGVnZXMuCkBAIC0xMTY3LDggKzEx OTIsNyBAQCBjb25zaWRlciB1c2luZyB0aGUgJy0tdXNlcicgb3B0aW9uIX4lIikpKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAoY2FjaGUtYnlwYXNzLXRocmVzaG9sZCkpKSkKICAgICAgICAg KGluZm8gKEdfICJwdWJsaXNoaW5nIH5hIG9uIH5hLCBwb3J0IH5kfiUiKQogICAgICAgICAgICAg ICAlc3RvcmUtZGlyZWN0b3J5Ci0gICAgICAgICAgICAgIChpbmV0LW50b3AgKHNvY2thZGRyOmZh bSBhZGRyZXNzKSAoc29ja2FkZHI6YWRkciBhZGRyZXNzKSkKLSAgICAgICAgICAgICAgKHNvY2th ZGRyOnBvcnQgYWRkcmVzcykpCisgICAgICAgICAgICAgIChpbmV0LW50b3AgKHNvY2thZGRyOmZh bSBhZGRyZXNzKSAoc29ja2FkZHI6YWRkciBhZGRyZXNzKSkgcG9ydCkKIAogICAgICAgICAoZm9y LWVhY2ggKGxhbWJkYSAoY29tcHJlc3Npb24pCiAgICAgICAgICAgICAgICAgICAgIChpbmZvIChH XyAidXNpbmcgJ35hJyBjb21wcmVzc2lvbiBtZXRob2QsIGxldmVsIH5hfiUiKQpkaWZmIC0tZ2l0 IGEvdGVzdHMvcHVibGlzaC5zY20gYi90ZXN0cy9wdWJsaXNoLnNjbQppbmRleCAwYTEzMmRmZTA0 Li4wMDUwOWM3ZTgyIDEwMDY0NAotLS0gYS90ZXN0cy9wdWJsaXNoLnNjbQorKysgYi90ZXN0cy9w dWJsaXNoLnNjbQpAQCAtNDYsNiArNDYsNyBAQAogICAjOnVzZS1tb2R1bGUgKHJucnMgYnl0ZXZl Y3RvcnMpCiAgICM6dXNlLW1vZHVsZSAoaWNlLTkgYmluYXJ5LXBvcnRzKQogICAjOnVzZS1tb2R1 bGUgKHNyZmkgc3JmaS0xKQorICAjOnVzZS1tb2R1bGUgKHNyZmkgc3JmaS04KQogICAjOnVzZS1t b2R1bGUgKHNyZmkgc3JmaS0yNikKICAgIzp1c2UtbW9kdWxlIChzcmZpIHNyZmktNjQpCiAgICM6 dXNlLW1vZHVsZSAoaWNlLTkgdGhyZWFkcykKQEAgLTgwLDkgKzgxLDYgQEAKICAgICAgICAgOzsg KFBPUlQgbWlnaHQgYmUgYSBjdXN0b20gYmluYXJ5IGlucHV0IHBvcnQpLgogICAgICAgICBwb3J0 KSkpKQogCi0oZGVmaW5lIChwdWJsaXNoLXVyaSByb3V0ZSkKLSAgKHN0cmluZy1hcHBlbmQgImh0 dHA6Ly9sb2NhbGhvc3Q6Njc4OSIgcm91dGUpKQotCiAoZGVmaW5lLXN5bnRheC1ydWxlICh3aXRo LXNlcGFyYXRlLW91dHB1dC1wb3J0cyBleHAgLi4uKQogICA7OyBTaW5jZSBwb3J0cyBhcmVuJ3Qg dGhyZWFkLXNhZmUgaW4gR3VpbGUgMi4wLCBkdXBsaWNhdGUgdGhlIG91dHB1dCBhbmQKICAgOzsg ZXJyb3IgcG9ydHMgdG8gbWFrZSBzdXJlIHRoZSB0d28gdGhyZWFkcyBkb24ndCBlbmQgdXAgc3Rl cHBpbmcgb24gZWFjaApAQCAtOTQsMjkgKzkyLDQxIEBACiAgICAgICAgICAgZXhwIC4uLikpKSkp CiAKIDs7IFJ1biBsb2NhbCBwdWJsaXNoaW5nIHNlcnZlcnMgaW4gYSBzZXBhcmF0ZSB0aHJlYWQu Ci07OyBBdHRlbXB0IHRvIGF2b2lkIHBvcnQgY29sbGlzaW9uIGJ5IGNob29zaW5nIHBvcnRzCi07 OyB1bmxpa2VseSB0byBiZSB1c2VkIGluIHRoZSB3aWxkICg2Nzg5IGFuZCBoaWdoZXIpCi0oZGVm aW5lIChzcGF3bi1ndWl4LXB1Ymxpc2ggcG9ydCAuIGV4dHJhLWFyZ3VtZW50cykKKyhkZWZpbmUg KHNwYXduLWd1aXgtcHVibGlzaCAuIGV4dHJhLWFyZ3VtZW50cykKICAgIlJ1biBhIGxvY2FsIHB1 Ymxpc2hpbmcgc2VydmVyIGluIGEgc2VwYXJhdGUgdGhyZWFkLgotVGhlIHNlcnZlciB3aWxsIGxp c3RlbiBhdCBQT1JULiAgRVhUUkEtQVJHVU1FTlRTIGFyZQotcGFzc2VkIGFzLWlzIGFzIGV4dHJh IGNvbW1hbmQtbGluZSBhcmd1bWVudHMuCi1UaGUgcmVzdWx0aW5nIHRocmVhZCBpcyByZXR1cm5l ZC4iCi0gICh3aXRoLXNlcGFyYXRlLW91dHB1dC1wb3J0cwotICAgKGNhbGwtd2l0aC1uZXctdGhy ZWFkCi0gICAgKGxhbWJkYSAoKQotICAgICAgKGFwcGx5IGd1aXgtcHVibGlzaCAoZm9ybWF0ICNm ICItLXBvcnQ9fmEiIHBvcnQpIGV4dHJhLWFyZ3VtZW50cykpKSkpCi0KLTs7IEtlZXAgdHJhY2sg b2YgcG9ydCBudW1iZXJzLCB0byBhdm9pZCBtdWx0aXBsZQotOzsgc2VydmVycyBsaXN0ZW5pbmcg YXQgdGhlIHNhbWUgcG9ydC4KLShkZWZpbmUgKmxhdGVzdC1wb3J0KiA2Nzg5KQorVGhlIHBvcnQg bnVtYmVyIHdpbGwgYXV0b21hdGljYWxseSBiZSBhc3NpZ25lZC4KK0VYVFJBLUFSR1VNRU5UUyBh cmUgcGFzc2VkIGFzLWlzIGFzIGV4dHJhIGNvbW1hbmQtbGluZQorYXJndW1lbnRzLiAgVGhlIHJl c3VsdGluZyBwb3J0IG51bWJlciBhbmQgdGhyZWFkIGlzIHJldHVybmVkLiIKKyAgKGxldCAoKCpw b3J0KiAjZikgOyBwcm90ZWN0ZWQgYnkgcG9ydC1tdXRleAorICAgICAgICAocG9ydC1tdXRleCAo bWFrZS1tdXRleCkpCisgICAgICAgIDs7IENvbmRpdGlvbiB2YXJpYWJsZSBmb3Igc2lnbmFsbGlu ZyAvIGNoZWNraW5nIHdoZXRoZXIKKyAgICAgICAgOzsgKnBvcnQqIGlzIHNldCAvIGNhbiBiZSBy ZWFkLgorICAgICAgICAocG9ydC1ib3VuZCAobWFrZS1jb25kaXRpb24tdmFyaWFibGUpKSkKKyAg ICAoZGVmaW5lICh3aGVuLWJvdW5kLXByb2MgcG9ydCkKKyAgICAgICh3aXRoLW11dGV4IHBvcnQt bXV0ZXggKHNldCEgKnBvcnQqIHBvcnQpKQorICAgICAgKHNpZ25hbC1jb25kaXRpb24tdmFyaWFi bGUgcG9ydC1ib3VuZCkpCisgICAgKGxldCAoKHRocmVhZAorICAgICAgICAgICAocGFyYW1ldGVy aXplICgod2hlbi1ib3VuZCB3aGVuLWJvdW5kLXByb2MpKQorICAgICAgICAgICAgICh3aXRoLXNl cGFyYXRlLW91dHB1dC1wb3J0cworICAgICAgICAgICAgICAoY2FsbC13aXRoLW5ldy10aHJlYWQK KyAgICAgICAgICAgICAgIChsYW1iZGEgKCkKKyAgICAgICAgICAgICAgICAgOzsgLS1wb3J0PTA6 IGF1dG9tYXRpY2FsbHkgYXNzaWduIGEgcG9ydAorICAgICAgICAgICAgICAgICAoYXBwbHkgZ3Vp eC1wdWJsaXNoICItLXBvcnQ9MCIgZXh0cmEtYXJndW1lbnRzKSkpKSkpKQorICAgICAgOzsgQSBs b29wIGlzIHJlcXVpcmVkIGluIGNhc2Ugb2Ygc3B1cmlvdXMgd2FrZXVwcy4KKyAgICAgICh3aXRo LW11dGV4IHBvcnQtbXV0ZXgKKyAgICAgICAgKGxldCBsb29wICgpCisgICAgICAgICAgKGlmICpw b3J0KgorICAgICAgICAgICAgICAodmFsdWVzICpwb3J0KiB0aHJlYWQpCisgICAgICAgICAgICAg IChiZWdpbgorICAgICAgICAgICAgICAgICh3YWl0LWNvbmRpdGlvbi12YXJpYWJsZSBwb3J0LWJv dW5kIHBvcnQtbXV0ZXgpCisgICAgICAgICAgICAgICAgKGxvb3ApKSkpKSkpKQogCiAoZGVmaW5l IChjYWxsLXdpdGgtZ3VpeC1wdWJsaXNoIGV4dHJhLWFyZ3VtZW50cyBwcm9jKQogICAiQ2FsbCBQ Uk9DIGluIGFuIGVudmlyb25tZW50IHdoZXJlIGEgbG9jYWwgcHVibGlzaGluZyBzZXJ2aWNlCiBp cyBydW5uaW5nIGluIGEgc2VwYXJhdGUgdGhyZWFkLCBwYXNzaW5nIHRoZSBwb3J0IGxpc3RlbmVk IGF0LgogRVhUUkEtQVJHVU1FTlRTIGFyZSBwYXNzZWQgYXMtaXMgYXMgZXh0cmEgY29tbWFuZC1s aW5lIGFyZ3VtZW50cy4iCi0gIChsZXQqICgocG9ydCAoMSsgKmxhdGVzdC1wb3J0KikpCi0gICAg ICAgICAodGhyZWFkIChhcHBseSBzcGF3bi1ndWl4LXB1Ymxpc2ggcG9ydCBleHRyYS1hcmd1bWVu dHMpKSkKLSAgICAoc2V0ISAqbGF0ZXN0LXBvcnQqIHBvcnQpCisgIChyZWNlaXZlIChwb3J0IHRo cmVhZCkKKyAgICAgIChhcHBseSBzcGF3bi1ndWl4LXB1Ymxpc2ggZXh0cmEtYXJndW1lbnRzKQog ICAgICh3YWl0LXVudGlsLXJlYWR5IHBvcnQpCiAgICAgKHByb2MgcG9ydCkpKQogCkBAIC0xMjQs NyArMTM0LDEwIEBAIEVYVFJBLUFSR1VNRU5UUyBhcmUgcGFzc2VkIGFzLWlzIGFzIGV4dHJhIGNv bW1hbmQtbGluZSBhcmd1bWVudHMuIgogICAoY2FsbC13aXRoLWd1aXgtcHVibGlzaCBleHRyYS1h cmd1bWVudHMKICAgICAobGFtYmRhIChwb3J0KSBleHAgLi4uKSkpCiAKLShzcGF3bi1ndWl4LXB1 Ymxpc2ggNjc4OSAiLUMwIikKKyhkZWZpbmUgZmlyc3Qtc2VydmVyIChzcGF3bi1ndWl4LXB1Ymxp c2ggIi1DMCIpKQorCisoZGVmaW5lIChwdWJsaXNoLXVyaSByb3V0ZSkKKyAgKGZvcm1hdCAjZiAi aHR0cDovL2xvY2FsaG9zdDp+YX5hIiBmaXJzdC1zZXJ2ZXIgcm91dGUpKQogCiAoZGVmaW5lICh3 YWl0LXVudGlsLXJlYWR5IHBvcnQpCiAgIDs7IFdhaXQgdW50aWwgdGhlIHNlcnZlciBpcyBhY2Nl cHRpbmcgY29ubmVjdGlvbnMuCkBAIC0xNTAsOSArMTYzLDYgQEAgRVhUUkEtQVJHVU1FTlRTIGFy ZSBwYXNzZWQgYXMtaXMgYXMgZXh0cmEgY29tbWFuZC1saW5lIGFyZ3VtZW50cy4iCiAgIDs7IE1h Z2ljIGJ5dGVzIG9mIGd6aXAgZmlsZS4KICAgI3Z1OCgjeDFmICN4OGIpKQogCi07OyBXYWl0IHVu dGlsIHRoZSB0d28gc2VydmVycyBhcmUgcmVhZHkuCi0od2FpdC11bnRpbC1yZWFkeSA2Nzg5KQot CiA7OyBJbml0aWFsaXplIHRoZSBwdWJsaWMvcHJpdmF0ZSBrZXkgU1JGSS0zOSBwYXJhbWV0ZXJz LgogKCVwdWJsaWMta2V5IChyZWFkLWZpbGUtc2V4cCAlcHVibGljLWtleS1maWxlKSkKICglcHJp dmF0ZS1rZXkgKHJlYWQtZmlsZS1zZXhwICVwcml2YXRlLWtleS1maWxlKSkKLS0gCjIuMzAuMAoK --=-W7eLZHwmS4Gn2D9/uQbC-- --=-TVwt4zRyKrV7bOBx8CVc Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYIADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYBgKYBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7rc0AP40KXysVJJJY8SGfd2Dt7PsYKA9 SEA1G6qFu7aaPFtcWwEAhE2vvR07PnByvDqLoevKNDeQQM2bI/hkYS7kDWf8xQc= =hvgi -----END PGP SIGNATURE----- --=-TVwt4zRyKrV7bOBx8CVc--