diff options
| author | Glenn Morris | 2016-01-06 13:08:35 -0500 |
|---|---|---|
| committer | Glenn Morris | 2016-01-06 13:08:35 -0500 |
| commit | baca4ad73e8b92b8ccf8ea9df1188b0195c1629b (patch) | |
| tree | f1b9d92cec00b4433908297a5be6b01b20eca981 | |
| parent | 6a311d2072b8a4ea530d9a541e661a8ad11bb1d7 (diff) | |
| download | emacs-baca4ad73e8b92b8ccf8ea9df1188b0195c1629b.tar.gz emacs-baca4ad73e8b92b8ccf8ea9df1188b0195c1629b.zip | |
* test/lisp/emacs-lisp/package-tests.el
(package-test-macro-compilation): Fixup branch merge.
| -rw-r--r-- | test/lisp/emacs-lisp/package-tests.el | 2 |
1 files changed, 1 insertions, 1 deletions
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." | |||
| 244 | 244 | ||
| 245 | (ert-deftest package-test-macro-compilation () | 245 | (ert-deftest package-test-macro-compilation () |
| 246 | "Install a package which includes a dependency." | 246 | "Install a package which includes a dependency." |
| 247 | (with-package-test (:basedir "data/package") | 247 | (with-package-test (:basedir "package-resources") |
| 248 | (package-install-file (expand-file-name "macro-problem-package-1.0/")) | 248 | (package-install-file (expand-file-name "macro-problem-package-1.0/")) |
| 249 | (require 'macro-problem) | 249 | (require 'macro-problem) |
| 250 | ;; `macro-problem-func' uses a macro from `macro-aux'. | 250 | ;; `macro-problem-func' uses a macro from `macro-aux'. |