[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 9514dcd 04/17: Merge branch 'master' of github.com:rocky/e
From: |
Rocky Bernstein |
Subject: |
[elpa] master 9514dcd 04/17: Merge branch 'master' of github.com:rocky/emacs-load-relative |
Date: |
Thu, 25 May 2017 02:05:02 -0400 (EDT) |
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
- [elpa] master e469f39 08/17: Another travis try, (continued)
- [elpa] master e469f39 08/17: Another travis try, Rocky Bernstein, 2017/05/25
- [elpa] master a3bdef8 10/17: Another travis try, Rocky Bernstein, 2017/05/25
- [elpa] master b11fb74 14/17: Correct location of short filter, Rocky Bernstein, 2017/05/25
- [elpa] master c719e8d 07/17: Another travis try, Rocky Bernstein, 2017/05/25
- [elpa] master 918a452 05/17: load-history list might not have string car, Rocky Bernstein, 2017/05/25
- [elpa] master 84f4a5e 03/17: * load-relative/test/test-file.el: Fix up copyright, Rocky Bernstein, 2017/05/25
- [elpa] master 839f651 02/17: Organization cleanup, Rocky Bernstein, 2017/05/25
- [elpa] master 4991912 13/17: Fix docstring quoting. New el-get method., Rocky Bernstein, 2017/05/25
- [elpa] master ec20ba0 15/17: Update README.md: fix small typos, Rocky Bernstein, 2017/05/25
- [elpa] master 8280df5 16/17: Merge pull request #7 from ohspite/patch-1, Rocky Bernstein, 2017/05/25
- [elpa] master 9514dcd 04/17: Merge branch 'master' of github.com:rocky/emacs-load-relative,
Rocky Bernstein <=
- [elpa] master 9a4289a 06/17: Can't figure out how to MELPA load test-simple, Rocky Bernstein, 2017/05/25
- [elpa] master 0a40d7d 09/17: Another travis try, Rocky Bernstein, 2017/05/25
- [elpa] master a820b19 11/17: Fixes #6 - this time for sure!?, Rocky Bernstein, 2017/05/25
- [elpa] master 9afba2e 17/17: Merge commit '8280df5ce6db836559a5c2442b97a2f02b6f7a05', Rocky Bernstein, 2017/05/25
- [elpa] master 2aa165f 12/17: Reinstate old load-relative ..., Rocky Bernstein, 2017/05/25