diff options
| -rw-r--r-- | .travis.yml | 73 | ||||
| -rw-r--r-- | Cask | 5 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | README.org | 7 | ||||
| -rw-r--r-- | test/pdf-info-test.el (renamed from test/pdf-info.ert) | 4 | ||||
| -rw-r--r-- | test/pdf-sync-test.el (renamed from test/pdf-sync.ert) | 0 | ||||
| -rw-r--r-- | test/pdf-tools-test.el (renamed from test/pdf-tools.ert) | 0 | ||||
| -rw-r--r-- | test/pdf-util-test.el (renamed from test/pdf-util.ert) | 0 | ||||
| -rw-r--r-- | test/pdf-view-test.el (renamed from test/pdf-view.ert) | 0 | ||||
| -rw-r--r-- | test/pdf-virtual-test.el (renamed from test/pdf-virtual.ert) | 0 | ||||
| -rw-r--r-- | test/test-helper.el (renamed from test/run-tests.el) | 26 |
11 files changed, 67 insertions, 51 deletions
diff --git a/.travis.yml b/.travis.yml index 96f06fd..158d219 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,44 +1,43 @@ -language: cpp +language: generic +sudo: false + +script: + - emacs --version + - make test env: - - EMACS=emacs24 - - EMACS=emacs-snapshot + matrix: + - EVM_EMACS=emacs-24.3-travis + - EVM_EMACS=emacs-24.4-travis + - EVM_EMACS=emacs-24.5-travis + - EVM_EMACS=emacs-git-snapshot-travis -compiler: - - gcc +matrix: + fast_finish: true + allow_failures: + - env: EVM_EMACS=emacs-24.4-travis + - env: EVM_EMACS=emacs-24.5-travis + - env: EVM_EMACS=emacs-git-snapshot-travis -install: - - if [ "$EMACS" = "emacs24" ]; then - sudo add-apt-repository -y ppa:cassou/emacs && - sudo apt-get update -qq && - sudo apt-get install -qq emacs24 emacs24-el; - fi - - if [ "$EMACS" = "emacs-snapshot" ]; then - sudo add-apt-repository -y ppa:ubuntu-elisp/ppa && - sudo apt-get update -qq && - sudo apt-get install -qq emacs-snapshot; - fi - - sudo apt-get install -qq make automake autoconf libpng-dev libz-dev - - sudo apt-get install libcairo2-dev libglib2.0-dev - - POPPLER=poppler-0.28.1 - - wget http://poppler.freedesktop.org/$POPPLER.tar.xz - - unxz $POPPLER.tar.xz - - tar xf $POPPLER.tar - - pushd $POPPLER - - ./configure --disable-gtk-doc-html - --disable-xpdf-headers - --disable-poppler-qt4 - --disable-poppler-qt5 - --disable-poppler-cpp - --disable-utils - --enable-xpdf-headers - && make -j4 && sudo make install - - popd - - curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python || true +before_install: + - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh || true - sed -i 's/"https:/"http:/' ~/.cask/*.el - - export PATH=/home/travis/.cask/bin:$PATH - cask upgrade-cask || true - - export LD_LIBRARY_PATH=/usr/local/lib + - evm install $EVM_EMACS --use --skip + - cask -script: - - make test +addons: + apt: + packages: + - gcc + - g++ + - make + - automake + - autoconf + - libpng-dev + - libz-dev + - libpoppler-glib-dev + - libpoppler-private-dev + +notifications: + email: false @@ -8,6 +8,7 @@ "server/epdfinfo") (development - (depends-on "emacs" "24.3") (depends-on "let-alist") - (depends-on "tablist")) + (depends-on "tablist") + (depends-on "ert-runner") + (depends-on "undercover")) @@ -29,7 +29,8 @@ bytecompile: .cask/$(emacs_version) # Run ERT tests test: all - cask exec $(emacs) --batch -l test/run-tests.el $(pkgfile) + PACKAGE_TAR=$(pkgfile) cask exec ert-runner + check: test # Run the autobuild script tests in docker @@ -2,8 +2,13 @@ #+AUTHOR: Andreas Politz #+EMAIL: politza@fh-trier.de -[[http://melpa.org/#/pdf-tools][http://melpa.org/packages/pdf-tools-badge.svg]] [[https://travis-ci.org/politza/pdf-tools.svg?branch%3Dmaster][https://travis-ci.org/politza/pdf-tools.svg?branch=master]] +[[https://coveralls.io/repos/politza/pdf-tools/badge.svg?branch=master&service=github][https://coveralls.io/github/politza/pdf-tools?branch=master]] +[[http://stable.melpa.org/#/pdf-tools][http://stable.melpa.org/packages/pdf-tools-badge.svg]] +[[http://melpa.org/#/pdf-tools][http://melpa.org/packages/pdf-tools-badge.svg]] + + + ** About this package PDF Tools is, among other things, a replacement of DocView for PDF files. The key difference is, that pages are not pre-rendered by diff --git a/test/pdf-info.ert b/test/pdf-info-test.el index 0412479..a8f9de9 100644 --- a/test/pdf-info.ert +++ b/test/pdf-info-test.el @@ -1,9 +1,5 @@ ;; -*- lexical-binding: t -*- -(require 'let-alist) -(require 'pdf-info) -(require 'ert) - (ert-deftest pdf-info-open/close () (pdf-test-with-test-pdf (should-not (pdf-info-open)) diff --git a/test/pdf-sync.ert b/test/pdf-sync-test.el index 544f99b..544f99b 100644 --- a/test/pdf-sync.ert +++ b/test/pdf-sync-test.el diff --git a/test/pdf-tools.ert b/test/pdf-tools-test.el index 8a247e8..8a247e8 100644 --- a/test/pdf-tools.ert +++ b/test/pdf-tools-test.el diff --git a/test/pdf-util.ert b/test/pdf-util-test.el index 1f468d3..1f468d3 100644 --- a/test/pdf-util.ert +++ b/test/pdf-util-test.el diff --git a/test/pdf-view.ert b/test/pdf-view-test.el index 58f6be5..58f6be5 100644 --- a/test/pdf-view.ert +++ b/test/pdf-view-test.el diff --git a/test/pdf-virtual.ert b/test/pdf-virtual-test.el index fc20981..fc20981 100644 --- a/test/pdf-virtual.ert +++ b/test/pdf-virtual-test.el diff --git a/test/run-tests.el b/test/test-helper.el index 50f5599..656ed9e 100644 --- a/test/run-tests.el +++ b/test/test-helper.el @@ -1,12 +1,18 @@ +;;; test-helper --- Test helper for pdf-tools + +;;; Commentary: +;; test helper inspired from https://github.com/tonini/overseer.el/blob/master/test/test-helper.el + +;;; Code: (require 'package) (require 'ert) (require 'cl-lib) -(unless (= 1 (length command-line-args-left)) - (error "Missing package tar or too many arguments")) +(unless (getenv "PACKAGE_TAR") + (error "Missing package tar. Must be passed by PACKAGE_TAR env variable")) -(defvar pdf-tools-package (expand-file-name (car command-line-args-left))) +(defvar pdf-tools-package (expand-file-name (getenv "PACKAGE_TAR"))) (unless (and (file-exists-p pdf-tools-package) (string-match "\\.tar\\'" pdf-tools-package)) @@ -84,6 +90,14 @@ (defmacro pdf-test-with-encrypted-pdf (&rest body) `(pdf-test-with-pdf "encrypted.pdf" ,@body)) -(dolist (file (directory-files "." t "\\.ert\\'")) - (load-file file)) -(ert-run-tests-batch-and-exit t) +;; --- +(require 'f) +(require 'undercover) +(undercover "lisp/*.el") +(require 'let-alist) +(require 'pdf-info) +(require 'ert) +(require 'pdf-tools) + +(provide 'test-helper) +;;; test-helper.el ends here |