[elpa] master 9514dcd 04/17: Merge branch 'master' of github.com:rocky/emacs-load-relative

[Rocky Bernstein]

branch: master
commit 9514dcd0130666d1ec583fd4df5f2d578b19df33
Merge: 84f4a5e 839f651
Author: rocky <address@hidden>
Commit: rocky <address@hidden>

    Merge branch 'master' of github.com:rocky/emacs-load-relative
---
 test/Makefile.am                                  | 10 +++++-----
 make-check-filter.rb => test/make-check-filter.rb |  0
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 80518c2..711f08e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,6 +2,9 @@ include $(top_srcdir)/common.mk
 
 PHONY=check test all check-elget test-elget help
 
+#: same thing as check
+all: check
+
 #: overall help on running the make targets
 help:
        @echo "The main function of this Makefile is to facilitate running 
tests."
@@ -43,17 +46,14 @@ check: $(CHECK_FILES)
 #: Run all tests via el-get
 check-elget:
        (cd $(top_srcdir)/test && $(EMACS) --batch --no-site-file --no-splash 
--load ./install-pkgs.el --load test-load.el)
-# Leave out until we can get dependecies worked out
-# #: Run all tests via el-get
-#check-elget: $(EL_GET_CHECK_FILES)s
 
 #: Run all tests with minimum verbosity
 check-short:
-       $(MAKE) check 2>&1  | ruby ../make-check-filter.rb
+       $(MAKE) check 2>&1  | ruby ./make-check-filter.rb
 
 #: Run all tests with minimum verbosity via el-get
 check-short-elget:
-       $(MAKE) check-elget 2>&1  | ruby ../make-check-filter.rb
+       $(MAKE) check-elget 2>&1  | ruby ./make-check-filter.rb
 
 test-%.run:
        (cd $(top_srcdir)/test && $(EMACS) --batch --no-site-file --no-splash 
--load $(@:.run=.el))
diff --git a/make-check-filter.rb b/test/make-check-filter.rb
similarity index 100%
rename from make-check-filter.rb
rename to test/make-check-filter.rb