Re: master bbb92dde01 1/3: Add unit tests and documentation for Eshell pattern-based globs

Re: master bbb92dde01 1/3: Add unit tests and documentation for Eshell pattern-based globs

[Lars Ingebrigtsen]

Eli Zaretskii <eliz@gnu.org> writes:

> branch: master
> commit bbb92dde01ec3fc46b24247fb2d181a21dbcc40a
> Author: Jim Porter <jporterbugs@gmail.com>
> Commit: Eli Zaretskii <eliz@gnu.org>
>
>     Add unit tests and documentation for Eshell pattern-based globs

Something in this patch series leads to the following "make check"
failure (on Debian):

Invalid read syntax: "#<"

Error: invalid-read-syntax ("#<")
  mapbacktrace(#[1028 "" [princ "  " prin1 "(" "  (" " " ")
"] 7 "

(fn EVALD FUNC ARGS FLAGS)"])
  debug-early-backtrace()
  debug-early(error (invalid-read-syntax "#<"))
  read(get-file-char)
  load("lisp/eshell/em-pred-tests" nil t)
  command-line-1(("-L" ":." "-l" "ert" "-l" "lisp/eshell/em-pred-tests" "--eval" "(ert-run-tests-batch-and-exit (quote (not (or (tag :expensive-test) (tag :unstable) (tag :nativecomp)))))"))
  command-line()
  normal-top-level()
make[3]: *** [Makefile:174: lisp/eshell/em-pred-tests.log] Error 255

It does not fail with "make em-pred-tests".

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master bbb92dde01 1/3: Add unit tests and documentation for Eshell pattern-based globs

[Jim Porter]

[-- Attachment #1: Type: text/plain, Size: 793 bytes --]

On 4/17/2022 2:49 AM, Lars Ingebrigtsen wrote:
> Eli Zaretskii <eliz@gnu.org> writes:
> 
>> branch: master
>> commit bbb92dde01ec3fc46b24247fb2d181a21dbcc40a
>> Author: Jim Porter <jporterbugs@gmail.com>
>> Commit: Eli Zaretskii <eliz@gnu.org>
>>
>>      Add unit tests and documentation for Eshell pattern-based globs
> 
> Something in this patch series leads to the following "make check"
> failure (on Debian):
> 
> Invalid read syntax: "#<"
[snip]
> It does not fail with "make em-pred-tests".

Does the attached patch fix it? I think the issue was that 
`eshell-partial-let-func' got the original function value too early, so 
during macro-expansion, it would insert something like `#<subr 
file-attributes>', which the parser didn't like. I've moved this bit 
later and it works for me.

[-- Attachment #2: 0001-Fix-Eshell-predicate-tests-when-running-from-make-ch.patch --]
[-- Type: text/plain, Size: 1317 bytes --]

From d0823f77cb942677d32d5268301f581b19f5ec07 Mon Sep 17 00:00:00 2001
From: Jim Porter <jporterbugs@gmail.com>
Date: Sun, 17 Apr 2022 12:33:58 -0700
Subject: [PATCH] Fix Eshell predicate tests when running from 'make check'

* test/lisp/eshell/em-pred-tests.el (eshell-partial-let-func): Get
original function after macro-expansion.
---
 test/lisp/eshell/em-pred-tests.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/lisp/eshell/em-pred-tests.el b/test/lisp/eshell/em-pred-tests.el
index fbf8945215..7f88ac4475 100644
--- a/test/lisp/eshell/em-pred-tests.el
+++ b/test/lisp/eshell/em-pred-tests.el
@@ -95,13 +95,13 @@ eshell-partial-let-func
   `(cl-letf
        ,(mapcar
          (lambda (override)
-           (let ((orig-function (symbol-function (car override))))
-             `((symbol-function #',(car override))
+           `((symbol-function #',(car override))
+             (let ((orig-function (symbol-function #',(car override))))
                (lambda (file &rest rest)
                  (apply
                   (if (and (stringp file) (string-prefix-p "/fake/" file))
                       ,(cadr override)
-                    ,orig-function)
+                    orig-function)
                   file rest)))))
          overrides)
      ,@body))
-- 
2.25.1

Re: master bbb92dde01 1/3: Add unit tests and documentation for Eshell pattern-based globs

[Lars Ingebrigtsen]

Jim Porter <jporterbugs@gmail.com> writes:

> Does the attached patch fix it? I think the issue was that
> `eshell-partial-let-func' got the original function value too early,
> so during macro-expansion, it would insert something like `#<subr
> file-attributes>', which the parser didn't like. I've moved this bit
> later and it works for me.

Yup; thanks.  Pushed to Emacs 29 now.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no