diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/emacs-shx-byte-compilation-test.patch | 35 |
3 files changed, 40 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 7b2be0f007..3d1afd4555 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1126,6 +1126,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ %D%/packages/patches/emacs-pgtk-super-key-fix.patch \ %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ + %D%/packages/patches/emacs-shx-byte-compilation-test.patch \ %D%/packages/patches/emacs-telega-path-placeholder.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7ab6015336..75aaafde21 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8296,7 +8296,10 @@ the speedbar window.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1wkqnc5n8if8fsh7f3bdr5nzn6dbj1nzdxlmnz8nflmx4g32fp6v")))) + (base32 + "1wkqnc5n8if8fsh7f3bdr5nzn6dbj1nzdxlmnz8nflmx4g32fp6v")) + (patches + (search-patches "emacs-shx-byte-compilation-test.patch")))) (build-system emacs-build-system) (arguments (list diff --git a/gnu/packages/patches/emacs-shx-byte-compilation-test.patch b/gnu/packages/patches/emacs-shx-byte-compilation-test.patch new file mode 100644 index 0000000000..b0f4714a6c --- /dev/null +++ b/gnu/packages/patches/emacs-shx-byte-compilation-test.patch @@ -0,0 +1,35 @@ +From 6e8cb6f2175cd5c108de615a970a27877adfaea0 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer <maxim.cournoyer@gmail.com> +Date: Fri, 19 Jan 2024 10:49:51 -0500 +Subject: [PATCH] tests: Fix byte-compilation test. + +* test/shx-test.el (shx-test-unit-byte-compile): Simply assert on the +return value of byte-compile-file, which is non-nil when there are no +errors. + +Fixes: <https://github.com/riscy/shx-for-emacs/issues/33> +--- + test/shx-test.el | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/test/shx-test.el b/test/shx-test.el +index e18cefb..ed5aee3 100644 +--- a/test/shx-test.el ++++ b/test/shx-test.el +@@ -83,10 +83,8 @@ Example: + "Test byte-compilation against the shx.el file." + (ignore-errors (kill-buffer "*Compile-Log*")) + (let ((file (replace-regexp-in-string ".elc$" ".el" (symbol-file 'shx-mode)))) +- (byte-compile-file file) + (shx-test-assert "shx.el passes byte-compilation" +- (with-current-buffer (get-buffer-create "*Compile-Log*") +- (<= (- (point-max) (point)) 3))))) ++ (byte-compile-file file)))) + + (defun shx-test-unit-declare-function () + "Test `declare-function'." + +base-commit: b99d16f36bc278d668d8428c4bc9af77064c336a +-- +2.41.0 + |