branch: elpa/sly
commit ccdf38bc82c222d18d32358f62d759b08a6c0897
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: João Távora <joaotav...@gmail.com>
Make it easier to build SLY on NonGNU ELPA
I decided I didn't want to add `contrib` to `load-path` in sly's
autoloads, and didn't want to try and add it manually in each of the
test files either...
* .gitignore: add sly-pkg.el and sly-autoloads.el
* test/sly-stickers-tests.el (sly-stickers): Provide path to contrib.
* test/sly-mrepl-tests.el (sly-mrepl): Provide path to contrib.
* test/sly-indentation-tests.el (sly-indentation): Provide path to contrib.
* test/sly-fontifying-fu-tests.el (sly-fontifying-fu): Provide path to
contrib.
* test/sly-autodoc-tests.el (sly-autodoc): Provide path to contrib.
---
.gitignore | 2 ++
test/sly-autodoc-tests.el | 2 +-
test/sly-fontifying-fu-tests.el | 4 ++--
test/sly-indentation-tests.el | 2 +-
test/sly-mrepl-tests.el | 2 +-
test/sly-stickers-tests.el | 2 +-
6 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3c8eeac..256a359 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@ doc/*.vrs
doc/*.tgz
doc/gh-pages
/dist/
+/sly-pkg.el
+/sly-autoloads.el
diff --git a/test/sly-autodoc-tests.el b/test/sly-autodoc-tests.el
index f59de4f..0e300d7 100644
--- a/test/sly-autodoc-tests.el
+++ b/test/sly-autodoc-tests.el
@@ -1,5 +1,5 @@
;; -*- lexical-binding: t; -*-
-(require 'sly-autodoc)
+(require 'sly-autodoc "contrib/sly-autodoc")
(require 'sly-tests "lib/sly-tests")
(require 'cl-lib)
diff --git a/test/sly-fontifying-fu-tests.el b/test/sly-fontifying-fu-tests.el
index b7465e8..a5da9e3 100644
--- a/test/sly-fontifying-fu-tests.el
+++ b/test/sly-fontifying-fu-tests.el
@@ -1,7 +1,7 @@
;; -*- lexical-binding: t; -*-
-(require 'sly-fontifying-fu)
+(require 'sly-fontifying-fu "contrib/sly-fontifying-fu")
(require 'sly-tests "lib/sly-tests")
-(require 'sly-autodoc)
+(require 'sly-autodoc "contrib/sly-autodoc")
(cl-defun sly-initialize-lisp-buffer-for-test-suite
(&key (font-lock-magic t) (autodoc t))
diff --git a/test/sly-indentation-tests.el b/test/sly-indentation-tests.el
index 99f557c..93bfef0 100644
--- a/test/sly-indentation-tests.el
+++ b/test/sly-indentation-tests.el
@@ -1,5 +1,5 @@
;; -*- lexical-binding: t; -*-
-(require 'sly-indentation)
+(require 'sly-indentation "contrib/sly-indentation")
(require 'sly-tests "lib/sly-tests")
(sly-define-common-lisp-style "common-lisp-indent-test"
diff --git a/test/sly-mrepl-tests.el b/test/sly-mrepl-tests.el
index a6a6629..fa482c6 100644
--- a/test/sly-mrepl-tests.el
+++ b/test/sly-mrepl-tests.el
@@ -1,5 +1,5 @@
;; -*- lexical-binding: t; -*-
-(require 'sly-mrepl)
+(require 'sly-mrepl "contrib/sly-mrepl")
(require 'sly-tests "lib/sly-tests")
(require 'cl-lib)
(require 'ert-x)
diff --git a/test/sly-stickers-tests.el b/test/sly-stickers-tests.el
index 29934a6..c102093 100644
--- a/test/sly-stickers-tests.el
+++ b/test/sly-stickers-tests.el
@@ -1,5 +1,5 @@
;; -*- lexical-binding: t; -*-
-(require 'sly-stickers)
+(require 'sly-stickers "contrib/sly-stickers")
(require 'sly-tests "lib/sly-tests")
(require 'cl-lib)
(require 'ert-x)
