aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJohn Wiegley2017-12-05 11:10:16 -0800
committerJohn Wiegley2017-12-05 11:10:16 -0800
commit0a628a27675491bbf154b4c641876ec1124a59ae (patch)
tree410c6260d4d0972f5863ef8b7c644f7ccaa4785e /test
parenta090961f105595b6c9b56c0e5cda567c76687b06 (diff)
downloademacs-0a628a27675491bbf154b4c641876ec1124a59ae.tar.gz
emacs-0a628a27675491bbf154b4c641876ec1124a59ae.zip
Avoid using pcase and many other macros in macro-expanded forms
This is related to https://github.com/jwiegley/use-package/issues/550
Diffstat (limited to 'test')
-rw-r--r--test/lisp/use-package/use-package-tests.el177
1 files changed, 112 insertions, 65 deletions
diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el
index 67d7c6f7e4d..4e65de082c1 100644
--- a/test/lisp/use-package/use-package-tests.el
+++ b/test/lisp/use-package/use-package-tests.el
@@ -994,12 +994,17 @@
994(ert-deftest use-package-test/:catch-1 () 994(ert-deftest use-package-test/:catch-1 ()
995 (match-expansion 995 (match-expansion
996 (use-package foo :catch t) 996 (use-package foo :catch t)
997 `(let 997 `(progn
998 ((,_ #'(lambda (keyword err) 998 (defvar ,_
999 (let ((msg (format "%s/%s: %s" 'foo keyword 999 #'(lambda
1000 (error-message-string err)))) 1000 (keyword err)
1001 nil 1001 (let
1002 (ignore (display-warning 'use-package msg :error)))))) 1002 ((msg
1003 (format "%s/%s: %s" 'foo keyword
1004 (error-message-string err))))
1005 nil
1006 (ignore
1007 (display-warning 'use-package msg :error)))))
1003 (condition-case-unless-debug err 1008 (condition-case-unless-debug err
1004 (require 'foo nil nil) 1009 (require 'foo nil nil)
1005 (error 1010 (error
@@ -1013,8 +1018,8 @@
1013(ert-deftest use-package-test/:catch-3 () 1018(ert-deftest use-package-test/:catch-3 ()
1014 (match-expansion 1019 (match-expansion
1015 (use-package foo :catch (lambda (keyword error))) 1020 (use-package foo :catch (lambda (keyword error)))
1016 `(let 1021 `(progn
1017 ((,_ (lambda (keyword error)))) 1022 (defvar ,_ (lambda (keyword error)))
1018 (condition-case-unless-debug err 1023 (condition-case-unless-debug err
1019 (require 'foo nil nil) 1024 (require 'foo nil nil)
1020 (error 1025 (error
@@ -1055,84 +1060,126 @@
1055(ert-deftest use-package-test/:after-5 () 1060(ert-deftest use-package-test/:after-5 ()
1056 (match-expansion 1061 (match-expansion
1057 (use-package foo :after (:any bar quux)) 1062 (use-package foo :after (:any bar quux))
1058 `(lexical-let ,_ 1063 `(progn
1059 (lexical-let ,_ 1064 (defvar ,_ nil)
1060 (progn 1065 (defvar ,_ nil)
1061 (eval-after-load 'bar 1066 (defvar ,_
1062 `(funcall ,_)) 1067 #'(lambda nil
1063 (eval-after-load 'quux 1068 (if ,_ ,_
1064 `(funcall ,_))))))) 1069 (setq ,_ t)
1070 (setq ,_
1071 (require 'foo nil nil)))))
1072 (progn
1073 (eval-after-load 'bar
1074 '(funcall ,_))
1075 (eval-after-load 'quux
1076 '(funcall ,_))))))
1065 1077
1066(ert-deftest use-package-test/:after-6 () 1078(ert-deftest use-package-test/:after-6 ()
1067 (match-expansion 1079 (match-expansion
1068 (use-package foo :after (:all (:any bar quux) bow)) 1080 (use-package foo :after (:all (:any bar quux) bow))
1069 `(lexical-let ,_ 1081 `(progn
1070 (lexical-let ,_ 1082 (defvar ,_ nil)
1071 (eval-after-load 'bow 1083 (defvar ,_ nil)
1072 '(progn 1084 (defvar ,_
1073 (eval-after-load 'bar 1085 #'(lambda nil
1074 `(funcall ,_)) 1086 (if ,_ ,_
1075 (eval-after-load 'quux 1087 (setq ,_ t)
1076 `(funcall ,_)))))))) 1088 (setq ,_
1089 (require 'foo nil nil)))))
1090 (eval-after-load 'bow
1091 '(progn
1092 (eval-after-load 'bar
1093 '(funcall ,_))
1094 (eval-after-load 'quux
1095 '(funcall ,_)))))))
1077 1096
1078(ert-deftest use-package-test/:after-7 () 1097(ert-deftest use-package-test/:after-7 ()
1079 (match-expansion 1098 (match-expansion
1080 (use-package foo :after (:any (:all bar quux) bow)) 1099 (use-package foo :after (:any (:all bar quux) bow))
1081 `(lexical-let ,_ 1100 `(progn
1082 (lexical-let ,_ 1101 (defvar ,_ nil)
1083 (progn 1102 (defvar ,_ nil)
1084 (eval-after-load 'quux 1103 (defvar ,_
1085 '(eval-after-load 'bar 1104 #'(lambda nil
1086 `(funcall ,_))) 1105 (if ,_ ,_
1087 (eval-after-load 'bow 1106 (setq ,_ t)
1088 `(funcall ,_))))))) 1107 (setq ,_
1108 (require 'foo nil nil)))))
1109 (progn
1110 (eval-after-load 'quux
1111 '(eval-after-load 'bar
1112 '(funcall ,_)))
1113 (eval-after-load 'bow
1114 '(funcall ,_))))))
1089 1115
1090(ert-deftest use-package-test/:after-8 () 1116(ert-deftest use-package-test/:after-8 ()
1091 (match-expansion 1117 (match-expansion
1092 (use-package foo :after (:all (:any bar quux) (:any bow baz))) 1118 (use-package foo :after (:all (:any bar quux) (:any bow baz)))
1093 `(lexical-let ,_ 1119 `(progn
1094 (lexical-let ,_ 1120 (defvar ,_ nil)
1095 (progn 1121 (defvar ,_ nil)
1096 (eval-after-load 'bow 1122 (defvar ,_
1097 '(progn 1123 #'(lambda nil
1098 (eval-after-load 'bar 1124 (if ,_ ,_
1099 `(funcall ,_)) 1125 (setq ,_ t)
1100 (eval-after-load 'quux 1126 (setq ,_
1101 `(funcall ,_)))) 1127 (require 'foo nil nil)))))
1102 (eval-after-load 'baz 1128 (progn
1103 '(progn 1129 (eval-after-load 'bow
1104 (eval-after-load 'bar 1130 '(progn
1105 `(funcall ,_)) 1131 (eval-after-load 'bar
1106 (eval-after-load 'quux 1132 '(funcall ,_))
1107 `(funcall ,_))))))))) 1133 (eval-after-load 'quux
1134 '(funcall ,_))))
1135 (eval-after-load 'baz
1136 '(progn
1137 (eval-after-load 'bar
1138 '(funcall ,_))
1139 (eval-after-load 'quux
1140 '(funcall ,_))))))))
1108 1141
1109(ert-deftest use-package-test/:after-9 () 1142(ert-deftest use-package-test/:after-9 ()
1110 (match-expansion 1143 (match-expansion
1111 (use-package foo :after (:any (:all bar quux) (:all bow baz))) 1144 (use-package foo :after (:any (:all bar quux) (:all bow baz)))
1112 `(lexical-let ,_ 1145 `(progn
1113 (lexical-let ,_ 1146 (defvar ,_ nil)
1114 (progn 1147 (defvar ,_ nil)
1115 (eval-after-load 'quux 1148 (defvar ,_
1116 '(eval-after-load 'bar 1149 #'(lambda nil
1117 `(funcall ,_))) 1150 (if ,_ ,_
1118 (eval-after-load 'baz 1151 (setq ,_ t)
1119 '(eval-after-load 'bow 1152 (setq ,_
1120 `(funcall ,_)))))))) 1153 (require 'foo nil nil)))))
1154 (progn
1155 (eval-after-load 'quux
1156 '(eval-after-load 'bar
1157 '(funcall ,_)))
1158 (eval-after-load 'baz
1159 '(eval-after-load 'bow
1160 '(funcall ,_)))))))
1121 1161
1122(ert-deftest use-package-test/:after-10 () 1162(ert-deftest use-package-test/:after-10 ()
1123 (match-expansion 1163 (match-expansion
1124 (use-package foo :after (:any (:all bar quux) (:any bow baz))) 1164 (use-package foo :after (:any (:all bar quux) (:any bow baz)))
1125 `(lexical-let ,_ 1165 `(progn
1126 (lexical-let ,_ 1166 (defvar ,_ nil)
1167 (defvar ,_ nil)
1168 (defvar ,_
1169 #'(lambda nil
1170 (if ,_ ,_
1171 (setq ,_ t)
1172 (setq ,_
1173 (require 'foo nil nil)))))
1174 (progn
1175 (eval-after-load 'quux
1176 '(eval-after-load 'bar
1177 '(funcall ,_)))
1127 (progn 1178 (progn
1128 (eval-after-load 'quux 1179 (eval-after-load 'bow
1129 '(eval-after-load 'bar 1180 '(funcall ,_))
1130 `(funcall ,_))) 1181 (eval-after-load 'baz
1131 (progn 1182 '(funcall ,_)))))))
1132 (eval-after-load 'bow
1133 `(funcall ,_))
1134 (eval-after-load 'baz
1135 `(funcall ,_))))))))
1136 1183
1137(ert-deftest use-package-test/:demand-1 () 1184(ert-deftest use-package-test/:demand-1 ()
1138 (match-expansion 1185 (match-expansion
generated by cgit v1.2.1 (git 2.18.0) at 2026-04-18 00:53:36 +0000