branch: externals/m-buffer
commit 8681342aaffa187e5c54945ab91b812965a96d19
Author: Phillip Lord <[email protected]>
Commit: Phillip Lord <[email protected]>
Renamespace assess-discover
Remove assess-discover, add fudge-discover and generating code. Add
README explaining all. Add .nosearch.
Having a namespaced clashing file with assess-discover is a bad idea
even if it seems necessary.
---
Makefile | 5 +++--
dev/.nosearch | 0
dev/Makefile | 7 +++++++
dev/README.txt | 9 +++++++++
dev/{assess-discover.el => fudge-discover.el} | 26 +++++++++++++++-----------
test/Makefile | 3 +++
6 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index ab97db67a4..2dcd53345a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ install:
just-test:
$(EMACS_ENV) $(CASK) emacs --batch -q \
--directory=. \
- --load "dev/assess-discover" \
- --funcall assess-discover-run-and-exit-batch
+ --load "dev/fudge-discover" \
+ --funcall fudge-discover-run-and-exit-batch
test: install just-test
@@ -56,5 +56,6 @@ multi-test:
make EMACS=$(EMACSES)/emacs-24.4/src/emacs test
make EMACS=$(EMACSES)/emacs-24.3/src/emacs test
make EMACS=$(EMACSES)/emacs-24.2/src/emacs test
+ make EMACS=$(EMACSES)/emacs-24.1/src/emacs test
.PHONY: test
diff --git a/dev/.nosearch b/dev/.nosearch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dev/Makefile b/dev/Makefile
new file mode 100644
index 0000000000..164272187a
--- /dev/null
+++ b/dev/Makefile
@@ -0,0 +1,7 @@
+
+gen-discover:
+ ## This obviously depends on assess being available and in the
+ ## right location
+ cp ../../assess/assess-discover.el .
+ perl -i -pe 's/assess-discover/fudge-discover/g' assess-discover.el
+ mv assess-discover.el fudge-discover.el
diff --git a/dev/README.txt b/dev/README.txt
new file mode 100644
index 0000000000..a71b3f870b
--- /dev/null
+++ b/dev/README.txt
@@ -0,0 +1,9 @@
+fudge-discover.el is a subset of my http://github.com/phillord/assess
+package, with the namespace, erm, fudged to something else.
+
+If you wish to use my assess package, you do not need to go to such
+lengths. I need to do such hackery here because (the rest of) assess
+uses m-buffer, and introducing a circular dependency at this point
+makes life really complicated.
+
+https://github.com/phillord/m-buffer-el/pull/6
diff --git a/dev/assess-discover.el b/dev/fudge-discover.el
similarity index 77%
rename from dev/assess-discover.el
rename to dev/fudge-discover.el
index a580d2c903..0e2f525e23 100644
--- a/dev/assess-discover.el
+++ b/dev/fudge-discover.el
@@ -1,4 +1,4 @@
-;;; assess-discover.el --- Test support functions -*- lexical-binding: t -*-
+;;; fudge-discover.el --- Test support functions -*- lexical-binding: t -*-
;;; Header:
@@ -26,7 +26,9 @@
;;; Code:
-(defun assess-discover-tests (directory)
+
+;; #+begin_src emacs-lisp
+(defun fudge-discover-tests (directory)
"Discover tests in directory.
Tests must conform to one (and only one!) of several naming
@@ -61,23 +63,25 @@ tests directory."
(concat dir-tests file))
(directory-files dir-tests nil ".*.el"))))))
-(defun assess-discover--load-all-tests (directory)
+(defun fudge-discover--load-all-tests (directory)
(mapc
'load
- (assess-discover-tests directory)))
+ (fudge-discover-tests directory)))
-(defun assess-discover-load-tests ()
+(defun fudge-discover-load-tests ()
(interactive)
- (assess-discover--load-all-tests default-directory))
+ (fudge-discover--load-all-tests default-directory))
;;;###autoload
-(defun assess-discover-run-batch (&optional selector)
- (assess-discover--load-all-tests default-directory)
+(defun fudge-discover-run-batch (&optional selector)
+ (fudge-discover--load-all-tests default-directory)
(ert-run-tests-batch selector))
;;;###autoload
-(defun assess-discover-run-and-exit-batch (&optional selector)
- (assess-discover--load-all-tests default-directory)
+(defun fudge-discover-run-and-exit-batch (&optional selector)
+ (fudge-discover--load-all-tests default-directory)
(ert-run-tests-batch-and-exit selector))
-(provide 'assess-discover)
+(provide 'fudge-discover)
+;;; fudge-discover.el ends here
+;; #+end_src
diff --git a/test/Makefile b/test/Makefile
new file mode 100644
index 0000000000..56b9fcfb6d
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,3 @@
+## what ever we called, don't do it here
+$(MAKECMDGOALS):
+ $(MAKE) -C .. $(MAKECMDGOALS)
