diff options
author | K. Handa <handa@gnu.org> | 2016-01-08 23:21:43 +0900 |
---|---|---|
committer | K. Handa <handa@gnu.org> | 2016-01-08 23:21:43 +0900 |
commit | f36805424633e3acb48ed9f0f729a36760e4cb7f (patch) | |
tree | 555f0e21f19aeee47d2855a5c7700afec5c81386 /test/lisp/emacs-lisp | |
parent | bc9a28ab424647209cc2f91ad21cdb41a7052812 (diff) | |
parent | 4580671f5e2a68885e0fca93eeaf9daaeebe82b3 (diff) | |
download | emacs-f36805424633e3acb48ed9f0f729a36760e4cb7f.tar.gz emacs-f36805424633e3acb48ed9f0f729a36760e4cb7f.tar.bz2 emacs-f36805424633e3acb48ed9f0f729a36760e4cb7f.zip |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'test/lisp/emacs-lisp')
5 files changed, 80 insertions, 1 deletions
diff --git a/test/lisp/emacs-lisp/package-resources/macro-problem-package-1.0/macro-aux.el b/test/lisp/emacs-lisp/package-resources/macro-problem-package-1.0/macro-aux.el new file mode 100644 index 00000000000..f43232224af --- /dev/null +++ b/test/lisp/emacs-lisp/package-resources/macro-problem-package-1.0/macro-aux.el @@ -0,0 +1,12 @@ +;;; macro-aux.el --- laksd -*- lexical-binding: t; -*- + +;; Author: Artur Malabarba <emacs@endlessparentheses.com> + +;;; Code: + +(defun macro-aux-1 ( &rest forms) + "Description" + `(progn ,@forms)) + +(provide 'macro-aux) +;;; macro-aux.el ends here diff --git a/test/lisp/emacs-lisp/package-resources/macro-problem-package-1.0/macro-problem.el b/test/lisp/emacs-lisp/package-resources/macro-problem-package-1.0/macro-problem.el new file mode 100644 index 00000000000..0533b1bd9c4 --- /dev/null +++ b/test/lisp/emacs-lisp/package-resources/macro-problem-package-1.0/macro-problem.el @@ -0,0 +1,21 @@ +;;; macro-problem.el --- laksd -*- lexical-binding: t; -*- + +;; Author: Artur Malabarba <emacs@endlessparentheses.com> +;; Keywords: tools +;; Version: 1.0 + +;;; Code: + +(require 'macro-aux) + +(defmacro macro-problem-1 ( &rest forms) + "Description" + `(progn ,@forms)) + +(defun macro-problem-func () + "" + (macro-problem-1 'a 'b) + (macro-aux-1 'a 'b)) + +(provide 'macro-problem) +;;; macro-problem.el ends here diff --git a/test/lisp/emacs-lisp/package-resources/macro-problem-package-2.0/macro-aux.el b/test/lisp/emacs-lisp/package-resources/macro-problem-package-2.0/macro-aux.el new file mode 100644 index 00000000000..6a55a40e3b4 --- /dev/null +++ b/test/lisp/emacs-lisp/package-resources/macro-problem-package-2.0/macro-aux.el @@ -0,0 +1,16 @@ +;;; macro-aux.el --- laksd -*- lexical-binding: t; -*- + +;; Author: Artur Malabarba <emacs@endlessparentheses.com> + +;;; Code: + +(defmacro macro-aux-1 ( &rest forms) + "Description" + `(progn ,@forms)) + +(defmacro macro-aux-3 ( &rest _) + "Description" + 90) + +(provide 'macro-aux) +;;; macro-aux.el ends here diff --git a/test/lisp/emacs-lisp/package-resources/macro-problem-package-2.0/macro-problem.el b/test/lisp/emacs-lisp/package-resources/macro-problem-package-2.0/macro-problem.el new file mode 100644 index 00000000000..cad4ed93f19 --- /dev/null +++ b/test/lisp/emacs-lisp/package-resources/macro-problem-package-2.0/macro-problem.el @@ -0,0 +1,30 @@ +;;; macro-problem.el --- laksd -*- lexical-binding: t; -*- + +;; Author: Artur Malabarba <emacs@endlessparentheses.com> +;; Keywords: tools +;; Version: 2.0 + +;;; Code: + +(require 'macro-aux) + +(defmacro macro-problem-1 ( &rest forms) + "Description" + `(progn ,(cadr (car forms)))) + + +(defun macro-problem-func () + "" + (list (macro-problem-1 '1 'b) + (macro-aux-1 'a 'b))) + +(defmacro macro-problem-3 (&rest _) + "Description" + 10) + +(defun macro-problem-10-and-90 () + "" + (list (macro-problem-3 haha) (macro-aux-3 hehe))) + +(provide 'macro-problem) +;;; macro-problem.el ends here diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el index 7206084f324..f8e05721255 100644 --- a/test/lisp/emacs-lisp/package-tests.el +++ b/test/lisp/emacs-lisp/package-tests.el @@ -244,7 +244,7 @@ Must called from within a `tar-mode' buffer." (ert-deftest package-test-macro-compilation () "Install a package which includes a dependency." - (with-package-test (:basedir "data/package") + (with-package-test (:basedir "package-resources") (package-install-file (expand-file-name "macro-problem-package-1.0/")) (require 'macro-problem) ;; `macro-problem-func' uses a macro from `macro-aux'. |