Merge e759406 into cfd1d08

.gitignore

@@ -1,2 +1,3 @@
 *.elc
 /.cask/
+/tests/*.res.*

.travis.yml

@@ -10,15 +10,18 @@ matrix:
   allow_failures:
     - env: EMACS_VERSION=snapshot
 env:
-  - EMACS_VERSION=24.3
-  - EMACS_VERSION=24.5
   - EMACS_VERSION=25.1
+  - EMACS_VERSION=25.2
+  - EMACS_VERSION=25.3
+  - EMACS_VERSION=26.1
+  - EMACS_VERSION=26.2
+  - EMACS_VERSION=26.3
   - EMACS_VERSION=snapshot
 before_install:
   # Configure $PATH: Executables are installed to $HOME/bin
   - export PATH="$HOME/bin:$PATH"
   # Download the makefile to emacs-travis.mk
-  - wget 'https://raw.githubusercontent.com/flycheck/emacs-travis/master/emacs-travis.mk'
+  - wget 'https://raw.githubusercontent.com/CyberShadow/emacs-travis/patch-1/emacs-travis.mk'
   # Install Emacs (according to $EMACS_VERSION) and Cask
   - make -f emacs-travis.mk install_emacs
   - make -f emacs-travis.mk install_cask
@@ -27,5 +30,6 @@ install:
 script:
   # cask exec ert-runner
   - emacs --version
-  - make compile
-  - make test
+  - COVERALLS_PARALLEL=1 make test
+notifications:
+  webhooks: https://coveralls.io/webhook

Cask

@@ -2,4 +2,5 @@
 (source melpa)
 
 (development
- (depends-on "undercover"))
+ (depends-on "dash")
+ (depends-on "shut-up"))

Makefile

@@ -1,13 +1,32 @@
 emacs ?= emacs
 all: test
 
-test: clean
-	cask exec emacs -Q -batch -l d-mode-test.el -l d-mode.el -f ert-run-tests-batch-and-exit
+test: test-source test-compiled
+
+test-source: clean
+	cask exec emacs -Q -batch -l d-mode-test.el -l d-mode.el  -f ert-run-tests-batch-and-exit
+
+test-compiled: compile
+	D_MODE_NO_COVERAGE=1 cask exec emacs -Q -batch -l d-mode-test.el -l d-mode.elc -f ert-run-tests-batch-and-exit
+
+# Generate a coverage report viewable in Emacs.
+coverage: clean
+	rm -f d-mode.elc
+	D_MODE_COVERAGE=1 cask exec emacs -Q -batch -l d-mode-test.el -l d-mode.el  -f ert-run-tests-batch-and-exit
 
 compile:
-	$(emacs) -Q -batch -f batch-byte-compile d-mode.el
+	$(emacs) -Q -batch --eval '(setq byte-compile-error-on-warn t)' -f batch-byte-compile d-mode.el
 
 clean:
 	rm -f d-mode.elc
+	find tests -name '*.res.*' -delete
+
+# Show just the differences between the actual and expected results.
+test-diff:
+	for f in tests/*.res.* ; do diff --color -u "$${f/.res/}" "$$f" ; done
+
+# Accept any mismatching actual output as the expected output.
+test-accept:
+	for f in tests/*.res.* ; do mv "$$f" "$${f/.res/}" ; done
 
-.PHONY:	all test
+.PHONY:	all test compile clean test-diff test-accept

README.md

@@ -8,9 +8,10 @@
 
 An Emacs major mode for editing D code.
 
-This mode is currently known to work with Emacs 24 and 25.
+This mode is currently known to work with Emacs 25 and 26.
+For best results, use Emacs 26.
 
-The best way of installing this major mode, at least for Emacs 24, is to use the packaging system. Add MELPA
+The best way of installing this major mode, at least for Emacs 26, is to use the packaging system. Add MELPA
 or MELPA Stable to the list of repositories to access this mode. For those who want only formal, tagged
 releases use MELPA Stable:
 

coverage/.gitignore

@@ -0,0 +1 @@
+/.resultset.json*