branch: elpa/logview
commit a6fa225401f6db464c58fcaf54e6725c0ce60661
Author: Paul Pogonyshev <pogonys...@gmail.com>
Commit: Paul Pogonyshev <pogonys...@gmail.com>
Use Eldev.
---
.gitignore | 6 +++++-
.travis.yml | 11 +++++------
Eldev | 13 +++++++++++++
run-tests.sh | 45 ---------------------------------------------
4 files changed, 23 insertions(+), 52 deletions(-)
diff --git a/.gitignore b/.gitignore
index e5c14b91f3..30e04dd566 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
+/.eldev
+/Eldev-local
+
*.elc
-local-environment.el
+
+/dist
diff --git a/.travis.yml b/.travis.yml
index 11344109fe..a443014522 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ language: emacs-lisp
dist: trusty
install:
- - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw >
travis.sh && source ./travis.sh
- - evm install $EVM_EMACS --use --skip
+ - curl -fsSL
https://raw.github.com/doublep/eldev/master/webinstall/travis-eldev-and-ert >
x.sh && source ./x.sh
+ - evm install $EVM_EMACS --use
env:
- EVM_EMACS=emacs-24.4-travis
@@ -16,7 +16,6 @@ env:
- EVM_EMACS=emacs-26.3-travis
script:
- - echo "(add-to-list 'package-archives '(\"melpa\" .
\"http://stable.melpa.org/packages/\";) t)" >> ./local-environment.el
- - echo "(package-refresh-contents)"
>> ./local-environment.el
- - echo "(unless (require 'datetime nil t) (package-install 'datetime))"
>> ./local-environment.el
- - ./run-tests.sh
+ - eldev -p -dtT test --expect 5
+ # Also require that byte-compilation produces no warnings.
+ - eldev -dtT compile --set all --warnings-as-errors
diff --git a/Eldev b/Eldev
new file mode 100644
index 0000000000..874af34058
--- /dev/null
+++ b/Eldev
@@ -0,0 +1,13 @@
+; -*- mode: emacs-lisp; lexical-binding: t -*-
+
+(eldev-require-version "0.1.1")
+
+(eldev-use-package-archive 'melpa-stable)
+
+;; Emacs 24 seems to issue a buggy byte-compilation warning in
+;; `logview--views'. For this reason, disable `-W' on Emacs 24.
+(add-hook 'eldev-build-system-hook
+ (lambda ()
+ (when (and (< emacs-major-version 25)
eldev-build-treat-warnings-as-errors)
+ (eldev-warn "Disabling `--warnings-as-errors', as certain
warnings on Emacs 24 are incorrect")
+ (setf eldev-build-treat-warnings-as-errors nil))))
diff --git a/run-tests.sh b/run-tests.sh
deleted file mode 100755
index 14124c5e2c..0000000000
--- a/run-tests.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-
-# Usage: ./run-tests.sh [ERT-SELECTOR]
-#
-# You can also set EMACS and ERT_SELECTOR variables in the
-# environment. If ERT_SELECTOR is empty (both on command line and in
-# environment), it defaults to t (i.e., everything).
-
-# If `local-environment.el' exists, it is loaded before `logview.el'.
-# Can be used e.g. to make package dependencies loadable. By the time
-# `local-environment.el' is loaded, Emacs packaging system is already
-# initialized.
-
-set -e
-
-OWN_DIRECTORY=$(dirname $0)
-
-if [ -z "$EMACS" ]; then
- EMACS=emacs
-fi
-
-if [ -n "$1" ]; then
- ERT_SELECTOR=$1
-fi
-
-if [ -z "$ERT_SELECTOR" ]; then
- ERT_SELECTOR=t
-fi
-
-$EMACS --batch
\
- --eval "(message \"Using Emacs %s\" (emacs-version))"
\
- --eval "(progn (require 'package) (package-initialize))"
\
- --directory "$OWN_DIRECTORY"
\
- --eval "(when (locate-file \"local-environment.el\" (list (car
load-path))) (load \"local-environment.el\" nil t t))" \
- --load logview.el
\
- --load test/logview.el
\
- --eval "(ert-run-tests-batch-and-exit (quote ${ERT_SELECTOR}))"
-
-# Fuck Emacs 24, I'm tired of fighting warnings on it.
-$EMACS --batch
\
- --eval "(progn (require 'package) (package-initialize))"
\
- --directory "$OWN_DIRECTORY"
\
- --eval "(when (locate-file \"local-environment.el\" (list (car
load-path))) (load \"local-environment.el\" nil t t))" \
- --eval "(when (>= emacs-major-version 25) (setq
byte-compile-error-on-warn t))" \
- --eval "(batch-byte-compile)" logview.el
