Revert "gnu: emacs-buttercup: Fix native comp tests with emacs-next."
This reverts commit e45f9b4b12
, which doesn't
fix the test issue.
master
parent
99a46ecb26
commit
a71232b2c5
|
@ -1095,7 +1095,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/elm-reactor-static-files.patch \
|
%D%/packages/patches/elm-reactor-static-files.patch \
|
||||||
%D%/packages/patches/elogind-fix-rpath.patch \
|
%D%/packages/patches/elogind-fix-rpath.patch \
|
||||||
%D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \
|
%D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \
|
||||||
%D%/packages/patches/emacs-buttercup-fix-native-comp-pretty-test.patch \
|
|
||||||
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
|
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
|
||||||
%D%/packages/patches/emacs-exec-path.patch \
|
%D%/packages/patches/emacs-exec-path.patch \
|
||||||
%D%/packages/patches/emacs-ess-fix-obsolete-function-alias.patch \
|
%D%/packages/patches/emacs-ess-fix-obsolete-function-alias.patch \
|
||||||
|
|
|
@ -28521,9 +28521,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)")
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1rvc9r6swb74lhzd877jidkkf2cxl5v4zz302j2imqhsbk844qzh"))
|
"1rvc9r6swb74lhzd877jidkkf2cxl5v4zz302j2imqhsbk844qzh"))))
|
||||||
(patches
|
|
||||||
(search-patches "emacs-buttercup-fix-native-comp-pretty-test.patch"))))
|
|
||||||
(build-system emacs-build-system)
|
(build-system emacs-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
From 0f822190360a99bac6b532058beb5e20cb2673c3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nicolas Graves <ngraves@ngraves.fr>
|
|
||||||
Date: Sun, 1 Oct 2023 20:20:03 +0200
|
|
||||||
Subject: [PATCH] test: Change `pretty' test regexp to pass tests on emacs 30.
|
|
||||||
|
|
||||||
---
|
|
||||||
tests/test-buttercup.el | 12 +++++++++---
|
|
||||||
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tests/test-buttercup.el b/tests/test-buttercup.el
|
|
||||||
index d68787b..a2e3ba7 100644
|
|
||||||
--- a/tests/test-buttercup.el
|
|
||||||
+++ b/tests/test-buttercup.el
|
|
||||||
@@ -2009,9 +2009,15 @@ text properties using `ansi-color-apply'."
|
|
||||||
"suite bc-bt-backtrace\n"
|
|
||||||
"\n"
|
|
||||||
"Traceback (most recent call last):\n"
|
|
||||||
- "λ (bc-bt-foo \"" (regex ,long-string) "\")\n"
|
|
||||||
- "λ (bc-bt-bar \"" (regex ,long-string) "\")\n"
|
|
||||||
- "λ (bc-bt-baz \"" (regex ,long-string) "\")\n"
|
|
||||||
+ (seq
|
|
||||||
+ "λ (bc-bt-foo \"" (regex ,long-string) "\")"
|
|
||||||
+ (optional "\n"))
|
|
||||||
+ (seq
|
|
||||||
+ "λ (bc-bt-bar \"" (regex ,long-string) "\")"
|
|
||||||
+ (optional "\n"))
|
|
||||||
+ (seq
|
|
||||||
+ "λ (bc-bt-baz \"" (regex ,long-string) "\")"
|
|
||||||
+ (optional "\n"))
|
|
||||||
(* (seq (or ?M ?λ) " (" (* not-newline) ; frame start
|
|
||||||
(*? (seq "\n " (* not-newline))) ; any number of pp lines
|
|
||||||
(* not-newline) ")\n")) ;; frame end
|
|
Reference in New Issue