From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#60845: 30.0.50; [PATCH] Add tests for Eshell interactive completion (and fix a bug in it) Date: Sun, 15 Jan 2023 17:50:10 -0800 Message-ID: <2b75d4d4-0533-2182-6da8-413391577bf5@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------3NHyFLoZKjOLzx6bQAC8DzLw" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30386"; mail-complaints-to="usenet@ciao.gmane.io" To: 60845@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jan 16 02:51:21 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pHEee-0007dW-Ld for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 16 Jan 2023 02:51:20 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHEeP-0007G6-Bd; Sun, 15 Jan 2023 20:51:05 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHEeN-0007Fc-Gr for bug-gnu-emacs@gnu.org; Sun, 15 Jan 2023 20:51:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHEeM-0007eK-Rv for bug-gnu-emacs@gnu.org; Sun, 15 Jan 2023 20:51:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHEeM-0005XC-J3 for bug-gnu-emacs@gnu.org; Sun, 15 Jan 2023 20:51:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 16 Jan 2023 01:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60845 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.167383381821220 (code B ref -1); Mon, 16 Jan 2023 01:51:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 16 Jan 2023 01:50:18 +0000 Original-Received: from localhost ([127.0.0.1]:59983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHEdd-0005WB-JO for submit@debbugs.gnu.org; Sun, 15 Jan 2023 20:50:18 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:53990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHEdb-0005W3-Ox for submit@debbugs.gnu.org; Sun, 15 Jan 2023 20:50:16 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHEdb-000773-E9 for bug-gnu-emacs@gnu.org; Sun, 15 Jan 2023 20:50:15 -0500 Original-Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHEdZ-0007V2-3V for bug-gnu-emacs@gnu.org; Sun, 15 Jan 2023 20:50:15 -0500 Original-Received: by mail-pf1-x434.google.com with SMTP id i1so4873671pfk.3 for ; Sun, 15 Jan 2023 17:50:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:from:content-language:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=yZYxv5VWIUj6lZcd6cPoRwvDWjrEtbH/lz79QnbwlBE=; b=RrYpIGydusaebe48FWAh3Gl0tFMixnqzHKsI+GyndXCfWi7DoeyLc6UzHHlacTHMie T7c1quF2DQ4HljLfU5JN7STDEylunTPZyMZQSL5V0Ra5Y50vQrKM6xwQm0EuxSpQANX7 SpBCQPCXaxY0iaDbLYLI919vEnzOXfZVsECKiKniTt1vVXic54y/tV+TPRB9KROfBrXE p7iL/LmYYfXCUDe848flTGB35wz+aYWlUyLcxEr1II42zZvPku4BlbxmBQOvAZwUTFwV F+WLAcS96X2C7EHflFUrbeT/wtaLoO+pTF4pu8szw/ZFQqNf6NQ+LYf91j8NLFjQtDCT wH+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:from:content-language:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yZYxv5VWIUj6lZcd6cPoRwvDWjrEtbH/lz79QnbwlBE=; b=3067xLPv7yoM9dsok8jus1VSy9iyMe8BoEo2cQjtD3hc/nY1mGA8WGCTGmy9r3SBxW FluSiXTmwwB2YcPllARpwC7Mkx4UF6+Y+LuQlDXF0Ipizm/CE2lWyJwAz/wVHF6ipYaB WJyCgAubLAZPs9zc9X7P4gwLwbf67380CyLHV7NsNykcsEv+5ShbPZfcl+6KnbA+skPS 5HwGIgC9I8qxDVDmUdAERDc2BpFOR5Fa3nd/xbx9+1a20XdDm9LE4a2xyO8WpqSfsIu7 zhiQJT0pOb2ovAuMGsycimPwm6E7SZa2BTJEDdnlAKqGFzkQUD5ZtCUporvHwxxAzS4V GsPA== X-Gm-Message-State: AFqh2koRmxK8zMX3vnyJamfbXHWNDg/Sx+IYq7CxiZksUSGt++HPNRI+ yfMiUB5UELxjKkASmJMvVDsJQj+gl+2fvA== X-Google-Smtp-Source: AMrXdXtm5lpBOFWx0mx+AR5HucUlG7dggXB0jbHNvxwXB+7Meu+AIkRb8gQKx/z/r1HHNfqJ9kn/wQ== X-Received: by 2002:aa7:924d:0:b0:57e:866d:c095 with SMTP id 13-20020aa7924d000000b0057e866dc095mr82007504pfp.25.1673833811208; Sun, 15 Jan 2023 17:50:11 -0800 (PST) Original-Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id 63-20020a621942000000b0056d98e359a5sm17010160pfz.165.2023.01.15.17.50.10 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 15 Jan 2023 17:50:10 -0800 (PST) X-Mozilla-News-Host: news://news.gmane.io:119 Content-Language: en-US Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=jporterbugs@gmail.com; helo=mail-pf1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:253458 Archived-At: This is a multi-part message in MIME format. --------------3NHyFLoZKjOLzx6bQAC8DzLw Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit This is a followup from bug#60464 and friends. Over there, we discussed problems with Pcomplete when used from Eshell, namely that Eshell sometimes gives Pcomplete non-string arguments. I mentioned that we should probably have automated tests for the Eshell side so that we can make further improvements to Pcomplete without causing regressions, so here are some tests. I also fixed an edge case in 'eshell-complete-parse-arguments' where it wasn't correctly handling the new variable-splicing syntax in Eshell. That's patch 0002. Of course, these tests are just a start, and there are probably lots of others that we could add. --------------3NHyFLoZKjOLzx6bQAC8DzLw Content-Type: text/plain; charset=UTF-8; name="0001-Add-regression-tests-for-Eshell-completions.patch" Content-Disposition: attachment; filename="0001-Add-regression-tests-for-Eshell-completions.patch" Content-Transfer-Encoding: base64 RnJvbSBiZGVmMzdmNmNjMTAxODIwZjA2MGM3MThmNDAxNmEyOTIwNmM1MWQxIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFN1biwgMTUgSmFuIDIwMjMgMTY6NDQ6MTcgLTA4MDAKU3ViamVjdDogW1BB VENIIDEvMl0gQWRkIHJlZ3Jlc3Npb24gdGVzdHMgZm9yIEVzaGVsbCBjb21wbGV0aW9ucwoK KiBsaXNwL2VzaGVsbC9lc2gtY21kLmVsIChlc2hlbGwtY29tcGxldGUtbGlzcC1zeW1ib2xz KTogRml4CmRvY3N0cmluZy4KCiogdGVzdC9saXNwL2VzaGVsbC9lbS1jbXBsLXRlc3RzLmVs OiBOZXcgZmlsZS4KLS0tCiBsaXNwL2VzaGVsbC9lc2gtY21kLmVsICAgICAgICAgICAgfCAg IDIgKy0KIHRlc3QvbGlzcC9lc2hlbGwvZW0tY21wbC10ZXN0cy5lbCB8IDE0NyArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMTQ4IGluc2VydGlv bnMoKyksIDEgZGVsZXRpb24oLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCB0ZXN0L2xpc3AvZXNo ZWxsL2VtLWNtcGwtdGVzdHMuZWwKCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lc2gtY21k LmVsIGIvbGlzcC9lc2hlbGwvZXNoLWNtZC5lbAppbmRleCA5OWMzZDdmNjI3ZC4uYjVmMWQ2 MGZmMTggMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC1jbWQuZWwKKysrIGIvbGlzcC9l c2hlbGwvZXNoLWNtZC5lbApAQCAtMzQzLDcgKzM0Myw3IEBAIGVzaGVsbC1jbWQtaW5pdGlh bGl6ZQogCSAgICAgICMnZXNoZWxsLWNvbXBsZXRlLWxpc3Atc3ltYm9scyBuaWwgdCkpKQog CiAoZGVmdW4gZXNoZWxsLWNvbXBsZXRlLWxpc3Atc3ltYm9scyAoKQotICAiSWYgdGhlcmUg aXMgYSB1c2VyIHJlZmVyZW5jZSwgY29tcGxldGUgaXQuIgorICAiSWYgdGhlcmUgaXMgYSBM aXNwIHN5bWJvbCwgY29tcGxldGUgaXQuIgogICAobGV0ICgoYXJnIChwY29tcGxldGUtYWN0 dWFsLWFyZykpKQogICAgICh3aGVuIChzdHJpbmctbWF0Y2ggKGNvbmNhdCAiXFxgIiBlc2hl bGwtbGlzcC1yZWdleHApIGFyZykKICAgICAgIChzZXRxIHBjb21wbGV0ZS1zdHViIChzdWJz dHJpbmcgYXJnIChtYXRjaC1lbmQgMCkpCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvZXNoZWxs L2VtLWNtcGwtdGVzdHMuZWwgYi90ZXN0L2xpc3AvZXNoZWxsL2VtLWNtcGwtdGVzdHMuZWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLjgzN2FmOWQxMDYxCi0t LSAvZGV2L251bGwKKysrIGIvdGVzdC9saXNwL2VzaGVsbC9lbS1jbXBsLXRlc3RzLmVsCkBA IC0wLDAgKzEsMTQ3IEBACis7OzsgZW0tY21wbC10ZXN0cy5lbCAtLS0gZW0tY21wbCB0ZXN0 IHN1aXRlICAtKi0gbGV4aWNhbC1iaW5kaW5nOnQgLSotCisKKzs7IENvcHlyaWdodCAoQykg MjAyMyBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4KKworOzsgVGhpcyBmaWxlIGlz IHBhcnQgb2YgR05VIEVtYWNzLgorCis7OyBHTlUgRW1hY3MgaXMgZnJlZSBzb2Z0d2FyZTog eW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQorOzsgaXQgdW5kZXIgdGhl IHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQg YnkKKzs7IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIGVpdGhlciB2ZXJzaW9uIDMg b2YgdGhlIExpY2Vuc2UsIG9yCis7OyAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJz aW9uLgorCis7OyBHTlUgRW1hY3MgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBp dCB3aWxsIGJlIHVzZWZ1bCwKKzs7IGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91 dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCis7OyBNRVJDSEFOVEFCSUxJVFkgb3Ig RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlCis7OyBHTlUgR2Vu ZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorCis7OyBZb3Ugc2hvdWxk IGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5z ZQorOzsgYWxvbmcgd2l0aCBHTlUgRW1hY3MuICBJZiBub3QsIHNlZSA8aHR0cHM6Ly93d3cu Z251Lm9yZy9saWNlbnNlcy8+LgorCis7OzsgQ29tbWVudGFyeToKKworOzsgVGVzdHMgZm9y IEVzaGVsbCdzIGludGVyYWN0aXZlIGNvbXBsZXRpb24uCisKKzs7OyBDb2RlOgorCisocmVx dWlyZSAnZXJ0KQorKHJlcXVpcmUgJ2VzaGVsbCkKKyhyZXF1aXJlICdlbS1jbXBsKQorKHJl cXVpcmUgJ2VtLWRpcnMpCisocmVxdWlyZSAnZW0taGlzdCkKKyhyZXF1aXJlICdlbS10cmFt cCkKKyhyZXF1aXJlICdlbS11bml4KQorCisocmVxdWlyZSAnZXNoZWxsLXRlc3RzLWhlbHBl cnMKKyAgICAgICAgIChleHBhbmQtZmlsZS1uYW1lICJlc2hlbGwtdGVzdHMtaGVscGVycyIK KyAgICAgICAgICAgICAgICAgICAgICAgICAgIChmaWxlLW5hbWUtZGlyZWN0b3J5IChvciBs b2FkLWZpbGUtbmFtZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGRlZmF1bHQtZGlyZWN0b3J5KSkpKQorCisoZGVmdmFyIGVzaGVsbC10 ZXN0LXZhbHVlIG5pbCkKKworKGRlZnVuIGVzaGVsbC1pbnNlcnQtYW5kLWNvbXBsZXRlIChp bnB1dCkKKyAgIkluc2VydCBJTlBVVCBhbmQgaW52b2tlIGNvbXBsZXRpb24sIHJldHVybmlu ZyB0aGUgcmVzdWx0LiIKKyAgKGluc2VydCBpbnB1dCkKKyAgKGNvbXBsZXRpb24tYXQtcG9p bnQpCisgIChlc2hlbGwtZ2V0LW9sZC1pbnB1dCkpCisKKzs7OyBUZXN0czoKKworKGVydC1k ZWZ0ZXN0IGVtLWNtcGwtdGVzdC9wYXJzZS1hcmd1bWVudHMvcGlwZWxpbmUgKCkKKyAgIlRl c3QgdGhhdCBwYXJzaW5nIGFyZ3VtZW50cyBmb3IgY29tcGxldGlvbiBkaXNjYXJkcyBlYXJs aWVyIGNvbW1hbmRzLiIKKyAgKHdpdGgtdGVtcC1lc2hlbGwKKyAgIChsZXQgKChlc2hlbGwt dGVzdC12YWx1ZSAnKCJmb28iICJiYXIiKSkpCisgICAgIChpbnNlcnQgImVjaG8gaGkgfCBj YXQiKQorICAgICAoc2hvdWxkIChlcXVhbCAoY2FyIChlc2hlbGwtY29tcGxldGUtcGFyc2Ut YXJndW1lbnRzKSkKKyAgICAgICAgICAgICAgICAgICAgYCgiY2F0IikpKSkpKQorCisoZXJ0 LWRlZnRlc3QgZW0tY21wbC10ZXN0L3BhcnNlLWFyZ3VtZW50cy92YXJpYWJsZSAoKQorICAi VGVzdCBwYXJzaW5nIGFyZ3VtZW50cyB3aXRoIGEgdmFyaWFibGUgaW50ZXJwb2xhdGlvbi4i CisgICh3aXRoLXRlbXAtZXNoZWxsCisgICAobGV0ICgoZXNoZWxsLXRlc3QtdmFsdWUgJygi Zm9vIiAiYmFyIikpKQorICAgICAoaW5zZXJ0ICJlY2hvICRlc2hlbGwtdGVzdC12YWx1ZSIp CisgICAgIChzaG91bGQgKGVxdWFsIChjYXIgKGVzaGVsbC1jb21wbGV0ZS1wYXJzZS1hcmd1 bWVudHMpKQorICAgICAgICAgICAgICAgICAgICBgKCJlY2hvIiAoImZvbyIgImJhciIpKSkp KSkpCisKKyhlcnQtZGVmdGVzdCBlbS1jbXBsLXRlc3QvZmlsZS1jb21wbGV0aW9uL3VuaXF1 ZSAoKQorICAiVGVzdCBjb21wbGV0aW9uIG9mIGZpbGUgbmFtZXMgd2hlbiB0aGVyZSdzIGEg dW5pcXVlIHJlc3VsdC4iCisgICh3aXRoLXRlbXAtZXNoZWxsCisgICAoZXJ0LXdpdGgtdGVt cC1kaXJlY3RvcnkgZGVmYXVsdC1kaXJlY3RvcnkKKyAgICAgKHdyaXRlLXJlZ2lvbiBuaWwg bmlsIChleHBhbmQtZmlsZS1uYW1lICJmaWxlLnR4dCIpKQorICAgICAoc2hvdWxkIChlcXVh bCAoZXNoZWxsLWluc2VydC1hbmQtY29tcGxldGUgImVjaG8gZmkiKQorICAgICAgICAgICAg ICAgICAgICAiZWNobyBmaWxlLnR4dCAiKSkpKSkKKworKGVydC1kZWZ0ZXN0IGVtLWNtcGwt dGVzdC9maWxlLWNvbXBsZXRpb24vbm9uLXVuaXF1ZSAoKQorICAiVGVzdCBjb21wbGV0aW9u IG9mIGZpbGUgbmFtZXMgd2hlbiB0aGVyZSBhcmUgbXVsdGlwbGUgcmVzdWx0cy4iCisgICh3 aXRoLXRlbXAtZXNoZWxsCisgICAoZXJ0LXdpdGgtdGVtcC1kaXJlY3RvcnkgZGVmYXVsdC1k aXJlY3RvcnkKKyAgICAgKHdyaXRlLXJlZ2lvbiBuaWwgbmlsIChleHBhbmQtZmlsZS1uYW1l ICJmaWxlLnR4dCIpKQorICAgICAod3JpdGUtcmVnaW9uIG5pbCBuaWwgKGV4cGFuZC1maWxl LW5hbWUgImZpbGUuZWwiKSkKKyAgICAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC1pbnNlcnQt YW5kLWNvbXBsZXRlICJlY2hvIGZpIikKKyAgICAgICAgICAgICAgICAgICAgImVjaG8gZmls ZS4iKSkKKyAgICAgOzsgTm93IHRyeSBjb21wbGV0aW5nIGFnYWluLgorICAgICAobGV0ICgo bWluaWJ1ZmZlci1tZXNzYWdlLXRpbWVvdXQgMCkKKyAgICAgICAgICAgKGluaGliaXQtbWVz c2FnZSB0KSkKKyAgICAgICAoY29tcGxldGlvbi1hdC1wb2ludCkpCisgICAgIDs7IEZJWE1F OiBXZSBjYW4ndCB1c2UgYGN1cnJlbnQtbWVzc2FnZScgaGVyZS4KKyAgICAgKHdpdGgtY3Vy cmVudC1idWZmZXIgKG1lc3NhZ2VzLWJ1ZmZlcikKKyAgICAgICAoc2F2ZS1leGN1cnNpb24K KyAgICAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1heCkpCisgICAgICAgICAoZm9yd2FyZC1s aW5lIC0xKQorICAgICAgICAgKHNob3VsZCAobG9va2luZy1hdCAiQ29tcGxldGUsIGJ1dCBu b3QgdW5pcXVlIikpKSkpKSkKKworKGVydC1kZWZ0ZXN0IGVtLWNtcGwtdGVzdC9maWxlLWNv bXBsZXRpb24vYWZ0ZXItbGlzdCAoKQorICAiVGVzdCBjb21wbGV0aW9uIG9mIGZpbGUgbmFt ZXMgYWZ0ZXIgcHJldmlvdXMgbGlzdCBhcmd1bWVudHMuCitTZWUgYnVnIzU5OTU2LiIKKyAg KHdpdGgtdGVtcC1lc2hlbGwKKyAgIChlcnQtd2l0aC10ZW1wLWRpcmVjdG9yeSBkZWZhdWx0 LWRpcmVjdG9yeQorICAgICAod3JpdGUtcmVnaW9uIG5pbCBuaWwgKGV4cGFuZC1maWxlLW5h bWUgImZpbGUudHh0IikpCisgICAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtaW5zZXJ0LWFu ZC1jb21wbGV0ZSAiZWNobyAobGlzdCAxIDIpIGZpIikKKyAgICAgICAgICAgICAgICAgICAg ImVjaG8gKGxpc3QgMSAyKSBmaWxlLnR4dCAiKSkpKSkKKworKGVydC1kZWZ0ZXN0IGVtLWNt cGwtdGVzdC9saXNwLXN5bWJvbC1jb21wbGV0aW9uICgpCisgICJUZXN0IGNvbXBsZXRpb24g b2YgTGlzcCBmb3JtcyBsaWtlIFwiIydzeW1ib2xcIiBhbmQgXCJgc3ltYm9sXCIuCitTZWUg PGxpc3AvZXNoZWxsL2VzaC1jbWQuZWw+LiIKKyAgKHdpdGgtdGVtcC1lc2hlbGwKKyAgIChz aG91bGQgKGVxdWFsIChlc2hlbGwtaW5zZXJ0LWFuZC1jb21wbGV0ZSAiZWNobyAjJ3N5c3Rl bS1uYW0iKQorICAgICAgICAgICAgICAgICAgImVjaG8gIydzeXN0ZW0tbmFtZSAiKSkpCisg ICh3aXRoLXRlbXAtZXNoZWxsCisgICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLWluc2VydC1h bmQtY29tcGxldGUgImVjaG8gYHN5c3RlbS1uYW0iKQorICAgICAgICAgICAgICAgICAgImVj aG8gYHN5c3RlbS1uYW1lICIpKSkpCisKKyhlcnQtZGVmdGVzdCBlbS1jbXBsLXRlc3QvbGlz cC1mdW5jdGlvbi1jb21wbGV0aW9uICgpCisgICJUZXN0IGNvbXBsZXRpb24gb2YgTGlzcCBm b3JtcyBsaWtlIFwiKGZ1bmMpXCIuCitTZWUgPGxpc3AvZXNoZWxsL2VzaC1jbWQuZWw+LiIK KyAgKHdpdGgtdGVtcC1lc2hlbGwKKyAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtaW5zZXJ0 LWFuZC1jb21wbGV0ZSAiZWNobyAoZXNoZWxsL2VjaCIpCisgICAgICAgICAgICAgICAgICAi ZWNobyAoZXNoZWxsL2VjaG8iKSkpKQorCisoZXJ0LWRlZnRlc3QgZW0tY21wbC10ZXN0L3Zh cmlhYmxlLXJlZi1jb21wbGV0aW9uICgpCisgICJUZXN0IGNvbXBsZXRpb24gb2YgdmFyaWFi bGUgcmVmZXJlbmNlcyBsaWtlIFwiJHZhclwiLgorU2VlIDxsaXNwL2VzaGVsbC9lc2gtdmFy LmVsPi4iCisgICh3aXRoLXRlbXAtZXNoZWxsCisgICAoc2hvdWxkIChlcXVhbCAoZXNoZWxs LWluc2VydC1hbmQtY29tcGxldGUgImVjaG8gJHN5c3RlbS1uYW0iKQorICAgICAgICAgICAg ICAgICAgImVjaG8gJHN5c3RlbS1uYW1lICIpKSkpCisKKyhlcnQtZGVmdGVzdCBlbS1jbXBs LXRlc3QvdmFyaWFibGUtYXNzaWduLWNvbXBsZXRpb24gKCkKKyAgIlRlc3QgY29tcGxldGlv biBvZiB2YXJpYWJsZSBhc3NpZ25tZW50cyBsaWtlIFwidmFyPXZhbHVlXCIuCitTZWUgPGxp c3AvZXNoZWxsL2VzaC12YXIuZWw+LiIKKyAgKHdpdGgtdGVtcC1lc2hlbGwKKyAgIChlcnQt d2l0aC10ZW1wLWRpcmVjdG9yeSBkZWZhdWx0LWRpcmVjdG9yeQorICAgICAod3JpdGUtcmVn aW9uIG5pbCBuaWwgKGV4cGFuZC1maWxlLW5hbWUgImZpbGUudHh0IikpCisgICAgIChzaG91 bGQgKGVxdWFsIChlc2hlbGwtaW5zZXJ0LWFuZC1jb21wbGV0ZSAiVkFSPWYiKQorICAgICAg ICAgICAgICAgICAgICAiVkFSPWZpbGUudHh0ICIpKSkpKQorCisoZXJ0LWRlZnRlc3QgZW0t Y21wbC10ZXN0L3VzZXItcmVmLWNvbXBsZXRpb24gKCkKKyAgIlRlc3QgY29tcGxldGVpb24g b2YgdXNlciByZWZlcmVuY2VzIGxpa2UgXCJ+dXNlclwiLgorU2VlIDxsaXNwL2VzaGVsbC9l bS1kaXJzLmVsPi4iCisgICh1bndpbmQtcHJvdGVjdAorICAgICAgKHdpdGgtdGVtcC1lc2hl bGwKKyAgICAgICAoY2wtbGV0ZiAoKChzeW1ib2wtZnVuY3Rpb24gJ2VzaGVsbC1yZWFkLXVz ZXItbmFtZXMpCisgICAgICAgICAgICAgICAgICAobGFtYmRhICgpIChzZXRxIGVzaGVsbC11 c2VyLW5hbWVzICcoKDEyMzQgLiAidXNlciIpKSkpKSkKKyAgICAgICAgIDs7IEZJWE1FOiBT aG91bGQgdGhpcyByZWFsbHkgYWRkIGEgc3BhY2UgYXQgdGhlIGVuZD8KKyAgICAgICAgIChz aG91bGQgKGVxdWFsIChlc2hlbGwtaW5zZXJ0LWFuZC1jb21wbGV0ZSAiZWNobyB+dXMiKQor ICAgICAgICAgICAgICAgICAgICAgICAgImVjaG8gfnVzZXIvICIpKSkpCisgICAgOzsgQ2xl YXIgdGhlIGNhY2hlZCB1c2VyIG5hbWVzIHdlIHNldCBhYm92ZS4KKyAgICAoc2V0cSBlc2hl bGwtdXNlci1uYW1lcyBuaWwpKSkKKworOzs7IGVtLWNtcGwtdGVzdHMuZWwgZW5kcyBoZXJl Ci0tIAoyLjI1LjEKCg== --------------3NHyFLoZKjOLzx6bQAC8DzLw Content-Type: text/plain; charset=UTF-8; name="0002-Properly-parse-Eshell-variable-splices-for-interacti.patch" Content-Disposition: attachment; filename*0="0002-Properly-parse-Eshell-variable-splices-for-interacti.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAzOWZlMWYxNWYwODA0ZTYwODg5MWYxNThhZmM0OWU4MDZmOTY5ZTk4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFN1biwgMTUgSmFuIDIwMjMgMTY6NDQ6MjMgLTA4MDAKU3ViamVjdDogW1BB VENIIDIvMl0gUHJvcGVybHkgcGFyc2UgRXNoZWxsIHZhcmlhYmxlIHNwbGljZXMgZm9yIGlu dGVyYWN0aXZlCiBjb21wbGV0aW9uCgpQcmV2aW91c2x5LCB0aGUgY29kZSBzaW1wbHkgaWdu b3JlZCB0aGUgc3BsaWNlIG9wZXJhdG9yLCB3aGljaCB1c3VhbGx5CndvcmtlZCwgYnV0IGlz bid0IGFjdHVhbGx5IGNvcnJlY3QuCgoqIGxpc3AvZXNoZWxsL2VtLWNtcGwuZWwgKGVzaGVs bC1jb21wbGV0ZS1ldmFsLWFyZ3VtZW50LWZvcm0pOiBOZXcKZnVuY3Rpb24uCihlc2hlbGwt Y29tcGxldGUtcGFyc2UtYXJndW1lbnRzKTogUHJvcGVybHkgcGFyc2UgdmFyaWFibGUgc3Bs aWNlcy4KCiogdGVzdC9saXNwL2VzaGVsbC9lbS1jbXBsLXRlc3RzLmVsCihlbS1jbXBsLXRl c3QvcGFyc2UtYXJndW1lbnRzL3ZhcmlhYmxlLXNwbGljZSk6IE5ldyB0ZXN0LgotLS0KIGxp c3AvZXNoZWxsL2VtLWNtcGwuZWwgICAgICAgICAgICB8IDU2ICsrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0KIHRlc3QvbGlzcC9lc2hlbGwvZW0tY21wbC10ZXN0cy5lbCB8ICA4 ICsrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDQ0IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvZXNoZWxsL2VtLWNtcGwuZWwgYi9saXNwL2VzaGVs bC9lbS1jbXBsLmVsCmluZGV4IDQyMDZhZDA0OGZhLi5hNjdmZTUzZWQ0NiAxMDA2NDQKLS0t IGEvbGlzcC9lc2hlbGwvZW0tY21wbC5lbAorKysgYi9saXNwL2VzaGVsbC9lbS1jbXBsLmVs CkBAIC0zMDYsNiArMzA2LDEyIEBAIGVzaGVsbC0tcGNvbXBsZXRlLWluc2VydC10YWIKICAg ICAoaW5zZXJ0LWFuZC1pbmhlcml0ICJcdCIpCiAgICAgKHRocm93ICdwY29tcGxldGVkIHQp KSkKIAorKGRlZnVuIGVzaGVsbC1jb21wbGV0ZS1ldmFsLWFyZ3VtZW50LWZvcm0gKGFyZykK KyAgIkV2YWx1YXRlIGEgc2luZ2xlIEVzaGVsbCBhcmd1bWVudCBmb3JtIEFSRyBmb3IgdGhl IHB1cnBvc2VzIG9mIGNvbXBsZXRpb24uIgorICAobGV0ICgocmVzdWx0IChlc2hlbGwtZG8t ZXZhbCBgKGVzaGVsbC1jb21tYW5kcyAsYXJnKSB0KSkpCisgICAgKGNsLWFzc2VydCAoZXEg KGNhciByZXN1bHQpICdxdW90ZSkpCisgICAgKGNhZHIgcmVzdWx0KSkpCisKIChkZWZ1biBl c2hlbGwtY29tcGxldGUtcGFyc2UtYXJndW1lbnRzICgpCiAgICJQYXJzZSB0aGUgY29tbWFu ZCBsaW5lIGFyZ3VtZW50cyBmb3IgYHBjb21wbGV0ZS1hcmd1bWVudCcuIgogICAod2hlbiAo YW5kIGVzaGVsbC1uby1jb21wbGV0aW9uLWR1cmluZy1qb2JzCkBAIC0zNDQsMTEgKzM1MCw2 IEBAIGVzaGVsbC1jb21wbGV0ZS1wYXJzZS1hcmd1bWVudHMKICAgICAoY2wtYXNzZXJ0ICg9 IChsZW5ndGggYXJncykgKGxlbmd0aCBwb3NucykpKQogICAgIChsZXQgKChhIGFyZ3MpIChp IDApIG5ldy1zdGFydCkKICAgICAgICh3aGlsZSBhCi0gICAgICAgIDs7IFJlbW92ZSBhbnkg dG9wLWxldmVsIGBlc2hlbGwtc3BsaWNlLWFyZ3MnIHNpZ2lscy4gIFRoZXNlCi0gICAgICAg IDs7IGFyZSBtZWFudCB0byBiZSByZXdyaXR0ZW4gYW5kIGNhbid0IGFjdHVhbGx5IGJlIGNh bGxlZC4KLSAgICAgICAgKHdoZW4gKGFuZCAoY29uc3AgKGNhciBhKSkKLSAgICAgICAgICAg ICAgICAgICAoZXEgKGNhYXIgYSkgJ2VzaGVsbC1zcGxpY2UtYXJncykpCi0gICAgICAgICAg KHNldGNhciBhIChjYWRhciBhKSkpCiAgICAgICAgIDs7IElmIHRoZXJlJ3MgYW4gdW5yZXBs YWNlZCBgZXNoZWxsLW9wZXJhdG9yJyBzaWdpbCwgY29uc2lkZXIKICAgICAgICAgOzsgdGhl IHRva2VuIGFmdGVyIGl0IHRoZSBuZXcgc3RhcnQgb2Ygb3VyIGFyZ3VtZW50cy4KICAgICAg ICAgKHdoZW4gKGFuZCAoY29uc3AgKGNhciBhKSkKQEAgLTM2NCwyMyArMzY1LDM4IEBAIGVz aGVsbC1jb21wbGV0ZS1wYXJzZS1hcmd1bWVudHMKIAkgICAgICAgKG5vdCAoZXEgKGNoYXIt YmVmb3JlICgxLSBlbmQpKSA/XFwpKSkKICAgICAgIChuY29uYyBhcmdzIChsaXN0ICIiKSkK ICAgICAgIChuY29uYyBwb3NucyAobGlzdCAocG9pbnQpKSkpCisgICAgOzsgRXZhbHVhdGUg YW5kIGV4cGFuZCBFc2hlbGwgZm9ybXMuCisgICAgKGxldCAoZXZhbGVkLWFyZ3MgZXZhbGVk LXBvc25zKQorICAgICAgKGNsLW1hcGMKKyAgICAgICAobGFtYmRhIChhcmcgcG9zbikKKyAg ICAgICAgIChwY2FzZSBhcmcKKyAgICAgICAgICAgKGAoZXNoZWxsLXNwbGljZS1hcmdzICx2 YWwpCisgICAgICAgICAgICAoZG9saXN0IChzdWJhcmcgKGVzaGVsbC1jb21wbGV0ZS1ldmFs LWFyZ3VtZW50LWZvcm0gdmFsKSkKKyAgICAgICAgICAgICAgKHB1c2ggc3ViYXJnIGV2YWxl ZC1hcmdzKQorICAgICAgICAgICAgICAocHVzaCBwb3NuIGV2YWxlZC1wb3NucykpKQorICAg ICAgICAgICAoKHByZWQgbGlzdHApCisgICAgICAgICAgICAocHVzaCAoZXNoZWxsLWNvbXBs ZXRlLWV2YWwtYXJndW1lbnQtZm9ybSBhcmcpIGV2YWxlZC1hcmdzKQorICAgICAgICAgICAg KHB1c2ggcG9zbiBldmFsZWQtcG9zbnMpKQorICAgICAgICAgICAoXworICAgICAgICAgICAg KHB1c2ggYXJnIGV2YWxlZC1hcmdzKQorICAgICAgICAgICAgKHB1c2ggcG9zbiBldmFsZWQt cG9zbnMpKSkpCisgICAgICAgYXJncyBwb3NucykKKyAgICAgIChzZXRxIGFyZ3MgKG5yZXZl cnNlIGV2YWxlZC1hcmdzKQorICAgICAgICAgICAgcG9zbnMgKG5yZXZlcnNlIGV2YWxlZC1w b3NucykpKQorICAgIDs7IENvbnZlcnQgYXJndW1lbnRzIHRvIGZvcm1zIHRoYXQgUGNvbXBs ZXRlIGNhbiB1bmRlcnN0YW5kLgogICAgIChjb25zIChtYXBjYXIKICAgICAgICAgICAgKGxh bWJkYSAoYXJnKQotICAgICAgICAgICAgIChsZXQgKCh2YWwKLSAgICAgICAgICAgICAgICAg ICAgKGlmIChsaXN0cCBhcmcpCi0gICAgICAgICAgICAgICAgICAgICAgICAobGV0ICgocmVz dWx0Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1kby1ldmFsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChsaXN0ICdlc2hlbGwtY29tbWFuZHMg YXJnKSB0KSkpCi0gICAgICAgICAgICAgICAgICAgICAgICAgIChjbC1hc3NlcnQgKGVxIChj YXIgcmVzdWx0KSAncXVvdGUpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAoY2FkciBy ZXN1bHQpKQotICAgICAgICAgICAgICAgICAgICAgIGFyZykpKQotICAgICAgICAgICAgICAg KGNvbmQgKChudW1iZXJwIHZhbCkKLSAgICAgICAgICAgICAgICAgICAgICAoc2V0cSB2YWwg KG51bWJlci10by1zdHJpbmcgdmFsKSkpCi0gICAgICAgICAgICAgICAgICAgICA7OyBleHBh bmQgLi4uLyBldGMgdGhhdCBvbmx5IGVzaGVsbCB1bmRlcnN0YW5kcyB0bwotICAgICAgICAg ICAgICAgICAgICAgOzsgc3RhbmRhcmQgLi4vLi4vCi0gICAgICAgICAgICAgICAgICAgICAo KGFuZCAoc3RyaW5ncCB2YWwpKSAoc3RyaW5nLW1hdGNoICJcXC5cXC5cXC4rLyIgdmFsKQot ICAgICAgICAgICAgICAgICAgICAgIChzZXRxIHZhbCAoZXNoZWxsLWV4cGFuZC1tdWx0aXBs ZS1kb3RzIHZhbCkpKSkKLSAgICAgICAgICAgICAgIChvciB2YWwgIiIpKSkKKyAgICAgICAg ICAgICAoY29uZAorICAgICAgICAgICAgICAoKG51bWJlcnAgYXJnKQorICAgICAgICAgICAg ICAgKG51bWJlci10by1zdHJpbmcgYXJnKSkKKyAgICAgICAgICAgICAgOzsgRXhwYW5kICIu Li4vIiBldGMgdGhhdCBvbmx5IEVzaGVsbCB1bmRlcnN0YW5kcyB0byB0aGUKKyAgICAgICAg ICAgICAgOzsgc3RhbmRhcmQgIi4uLy4uLyIuCisgICAgICAgICAgICAgICgoYW5kIChzdHJp bmdwIGFyZykgKHN0cmluZy1tYXRjaCAiXFwuXFwuXFwuKy8iIGFyZykpCisgICAgICAgICAg ICAgICAoZXNoZWxsLWV4cGFuZC1tdWx0aXBsZS1kb3RzIGFyZykpCisgICAgICAgICAgICAg ICgobnVsbCBhcmcpCisgICAgICAgICAgICAgICAiIikKKyAgICAgICAgICAgICAgKHQKKyAg ICAgICAgICAgICAgIGFyZykpKQogCSAgIGFyZ3MpCiAJICBwb3NucykpKQogCmRpZmYgLS1n aXQgYS90ZXN0L2xpc3AvZXNoZWxsL2VtLWNtcGwtdGVzdHMuZWwgYi90ZXN0L2xpc3AvZXNo ZWxsL2VtLWNtcGwtdGVzdHMuZWwKaW5kZXggODM3YWY5ZDEwNjEuLjI0NjBmNThjMjVjIDEw MDY0NAotLS0gYS90ZXN0L2xpc3AvZXNoZWxsL2VtLWNtcGwtdGVzdHMuZWwKKysrIGIvdGVz dC9saXNwL2VzaGVsbC9lbS1jbXBsLXRlc3RzLmVsCkBAIC02Miw2ICs2MiwxNCBAQCBlbS1j bXBsLXRlc3QvcGFyc2UtYXJndW1lbnRzL3ZhcmlhYmxlCiAgICAgIChzaG91bGQgKGVxdWFs IChjYXIgKGVzaGVsbC1jb21wbGV0ZS1wYXJzZS1hcmd1bWVudHMpKQogICAgICAgICAgICAg ICAgICAgICBgKCJlY2hvIiAoImZvbyIgImJhciIpKSkpKSkpCiAKKyhlcnQtZGVmdGVzdCBl bS1jbXBsLXRlc3QvcGFyc2UtYXJndW1lbnRzL3ZhcmlhYmxlLXNwbGljZSAoKQorICAiVGVz dCBwYXJzaW5nIGFyZ3VtZW50cyB3aXRoIGEgc3BsaWNlZCB2YXJpYWJsZSBpbnRlcnBvbGF0 aW9uLiIKKyAgKHdpdGgtdGVtcC1lc2hlbGwKKyAgIChsZXQgKChlc2hlbGwtdGVzdC12YWx1 ZSAnKCJmb28iICJiYXIiKSkpCisgICAgIChpbnNlcnQgImVjaG8gJEBlc2hlbGwtdGVzdC12 YWx1ZSIpCisgICAgIChzaG91bGQgKGVxdWFsIChjYXIgKGVzaGVsbC1jb21wbGV0ZS1wYXJz ZS1hcmd1bWVudHMpKQorICAgICAgICAgICAgICAgICAgICBgKCJlY2hvIiAiZm9vIiAiYmFy IikpKSkpKQorCiAoZXJ0LWRlZnRlc3QgZW0tY21wbC10ZXN0L2ZpbGUtY29tcGxldGlvbi91 bmlxdWUgKCkKICAgIlRlc3QgY29tcGxldGlvbiBvZiBmaWxlIG5hbWVzIHdoZW4gdGhlcmUn cyBhIHVuaXF1ZSByZXN1bHQuIgogICAod2l0aC10ZW1wLWVzaGVsbAotLSAKMi4yNS4xCgo= --------------3NHyFLoZKjOLzx6bQAC8DzLw--