me
/
guix
Archived
1
0
Fork 0
Code

tests: build-emacs-utils: Allow test to pass on Emacs 27 too. 

* tests/build-emacs-utils.scm
("emacs-batch-script: raise &emacs-batch-error on failure"): More loosely
match expected error string, which differs between Emacs 27 and Emacs 28.
master
Maxim Cournoyer 2022-07-13 10:21:38 -04:00
parent e1a8100936
commit dcf133587a
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/build-emacs-utils.scm
View File

@ -23,6 +23,7 @@
#:use-module (guix build utils) #:use-module (guix build utils)
#:use-module ((guix utils) #:use-module ((guix utils)
#:select (call-with-temporary-directory)) #:select (call-with-temporary-directory))
#:use-module (ice-9 regex)
#:use-module (srfi srfi-34) #:use-module (srfi srfi-34)
#:use-module (srfi srfi-64)) #:use-module (srfi srfi-64))
@ -36,8 +37,10 @@
(test-assert "emacs-batch-script: raise &emacs-batch-error on failure" (test-assert "emacs-batch-script: raise &emacs-batch-error on failure"
(guard (c ((emacs-batch-error? c) (guard (c ((emacs-batch-error? c)
(string-contains (emacs-batch-error-message c) ;; The error message format changed between Emacs 27 and Emacs
"Lisp error: (wrong-type-argument numberp \"three\")"))) ;; 28.
(string-match "[Ww]rong.*argument.*numberp.*\"three\""
(emacs-batch-error-message c))))
(emacs-batch-script '(mapcar 'number-to-string (list 1 2 "three"))))) (emacs-batch-script '(mapcar 'number-to-string (list 1 2 "three")))))
(call-with-temporary-directory (call-with-temporary-directory