aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-07-13 10:21:38 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-07-13 10:49:40 -0400
commitdcf133587ac7d73ba306a314e1a496a7efb9960b (patch)
tree103f06ecee32e9d753e6fd592ddf33dc0736cda5
parente1a8100936f297b2e645de5cf1bd8b390d26bc72 (diff)
downloadguix-dcf133587ac7d73ba306a314e1a496a7efb9960b.tar
guix-dcf133587ac7d73ba306a314e1a496a7efb9960b.tar.gz
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.
-rw-r--r--tests/build-emacs-utils.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/build-emacs-utils.scm b/tests/build-emacs-utils.scm
index 081032285a..4e851ed959 100644
--- a/tests/build-emacs-utils.scm
+++ b/tests/build-emacs-utils.scm
@@ -23,6 +23,7 @@
#:use-module (guix build utils)
#:use-module ((guix utils)
#:select (call-with-temporary-directory))
+ #:use-module (ice-9 regex)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-64))
@@ -36,8 +37,10 @@
(test-assert "emacs-batch-script: raise &emacs-batch-error on failure"
(guard (c ((emacs-batch-error? c)
- (string-contains (emacs-batch-error-message c)
- "Lisp error: (wrong-type-argument numberp \"three\")")))
+ ;; The error message format changed between Emacs 27 and Emacs
+ ;; 28.
+ (string-match "[Ww]rong.*argument.*numberp.*\"three\""
+ (emacs-batch-error-message c))))
(emacs-batch-script '(mapcar 'number-to-string (list 1 2 "three")))))
(call-with-temporary-directory