Skip to content

Commit 915723d

Browse files
committed
Travis CI configuration for Emacs 24.1 and 24.2
1 parent 3172552 commit 915723d

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ before_install:
44
- curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh
55
- evm install $EVM_EMACS --use --skip
66
env:
7+
- EVM_EMACS=emacs-24.1-travis CL="-l cl-lib-0.5.el"
8+
- EVM_EMACS=emacs-24.2-travis CL="-l cl-lib-0.5.el"
79
- EVM_EMACS=emacs-24.3-travis
810
- EVM_EMACS=emacs-24.4-travis
911
- EVM_EMACS=emacs-24.5-travis

tests/Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ TEST_HTML = $(TEST_SRCS:.text=.html)
1212

1313
test: compile-all
1414
$(EMACS) -Q --batch $(CL) \
15+
--eval '(setq byte-compile-warnings (quote (not cl-functions)))' \
1516
-l ert -l ../markdown-mode.elc -l markdown-test.elc \
1617
-f ert-run-tests-batch-and-exit
1718

1819
compile-all:
1920
$(EMACS) -Q --batch $(CL) \
21+
--eval '(setq byte-compile-warnings (quote (not cl-functions)))' \
2022
--eval '(setq byte-compile-error-on-warn t)' \
2123
-l ../markdown-mode.el \
2224
-f batch-byte-compile ../markdown-mode.el markdown-test.el
@@ -26,12 +28,9 @@ html: $(TEST_HTML)
2628
clean:
2729
rm -f $(TEST_HTML) *.elc ../*.elc
2830

29-
# add cl compatibility for emacs 24.1,2
30-
CL_ARG := -l cl-lib-0.5.el \
31-
--eval '(setq byte-compile-warnings (quote (not cl-functions)))'
3231
evm:
33-
$(MAKE) test EMACS="$(shell evm bin emacs-24.1)" CL="$(CL_ARG)"
34-
$(MAKE) test EMACS="$(shell evm bin emacs-24.2)" CL="$(CL_ARG)"
32+
$(MAKE) test EMACS="$(shell evm bin emacs-24.1)" CL="-l cl-lib-0.5.el"
33+
$(MAKE) test EMACS="$(shell evm bin emacs-24.2)" CL="-l cl-lib-0.5.el"
3534
$(MAKE) test EMACS="$(shell evm bin emacs-24.3)" CL=""
3635
$(MAKE) test EMACS="$(shell evm bin emacs-24.4)" CL=""
3736
$(MAKE) test EMACS="$(shell evm bin emacs-24.5)" CL=""

0 commit comments

Comments
 (0)