[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/test-simple 4ea89f0 3/4: Try to get TravisCI working ag
From: |
Stefan Monnier |
Subject: |
[elpa] externals/test-simple 4ea89f0 3/4: Try to get TravisCI working again |
Date: |
Tue, 16 Mar 2021 09:44:51 -0400 (EDT) |
branch: externals/test-simple
commit 4ea89f009ffbba043689390bee1d53232b1c9a00
Author: rocky <rocky@gnu.org>
Commit: rocky <rocky@gnu.org>
Try to get TravisCI working again
---
.travis.yml | 16 +++++++---------
run-travis-ci.sh | 21 +++++++++++++++++++++
test/Makefile.am | 24 ++++++++++++++++++------
3 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 743fe94..0257734 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,12 @@
-language: emacs
+language: emacs-lisp
env:
- - EMACS=emacs24
+ - EVM_EMACS=emacs-25.3-travis
install:
- - if [ "$EMACS" = 'emacs24' ]; then
- sudo add-apt-repository -y ppa:cassou/emacs &&
- sudo apt-get -qq update &&
- sudo apt-get -qq -f install &&
- sudo apt-get -qq install emacs24 emacs24-el;
- fi
+ - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw >
travis.sh && source ./travis.sh
+ - evm install $EVM_EMACS --use --skip
+
# run the tests
-script: /bin/sh ./autogen.sh && make check
+script:
+ - ./run-travis-ci.sh
diff --git a/run-travis-ci.sh b/run-travis-ci.sh
new file mode 100755
index 0000000..a17b3f9
--- /dev/null
+++ b/run-travis-ci.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+cd "$(dirname "$0")"
+
+set_default () {
+ eval "
+if [ -z \$$1 ]; then
+ $1=$2
+fi
+"
+}
+
+set_default EMACS "$(which emacs)"
+
+echo "*** Emacs version ***"
+echo "EMACS =" $(which $EMACS)
+$EMACS --version
+echo
+
+cask
+NO_CHECK_EMACS_PACKAGES=1 /bin/bash ./autogen.sh && cd test && make check-cask
diff --git a/test/Makefile.am b/test/Makefile.am
index cd86850..0caa636 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,9 +1,13 @@
include $(top_srcdir)/common.mk
-PHONY=check test all
+cask_test_files := test-basic.el test-fns.el test-no-clear.el
+
+EL_GET_CHECK_FILES = $(notdir $(cask_test_files:.el=.elrun))
+
+PHONY=check test all check-elget test-elget help
EXTRA_DIST=gcd.py gcd.rb
-all:
+all:
#: same thing as "check"
test: check
@@ -19,11 +23,19 @@ check: $(CHECK_FILES)
check-short:
$(MAKE) check 2>&1 | ruby ../make-check-filter.rb
+#: Run all tests via cask
+check-cask: $(EL_GET_CHECK_FILES)
+
+install-lispLISP: $(lisp_LISP) $(ELCFILES)
+
test-%.run:
- (cd $(top_srcdir)/test && $(EMACS) --batch --no-site-file --no-splash
--load $(@:.run=.el))
+ (cd $(top_srcdir)/test && EMACSLOADPATH=$(EMACSLOADPATH) $(EMACS)
--batch --no-site-file --no-splash --load $(@:.run=.el))
+
+#: Run tests
+test-%.elrun:
+ (cd $(top_srcdir)/test && $(EMACS) --batch --no-site-file --no-splash
--load $(@:.elrun=.el))
-# Whatever it is you want to do, it should be forwarded to the
+# Whatever it is you want to do, it should be forwarded to the
# to top-level directories
-%:
+%:
$(MAKE) -C .. $@
-