From 2666c2ec2a85ca5d68f61b49081d82d1e5165a2d Mon Sep 17 00:00:00 2001 From: Yakkala Yagnesh Raghava Date: Fri, 22 Mar 2013 06:37:48 +0900 Subject: [PATCH] * .travis.yml: travis-ci setup (adopted from magit sources). * testing/org-test.el: remove requiring ert-x (needed for < emacs-24) Signed-off-by: Yakkala Yagnesh Raghava --- .travis.yml | 24 ++++++++++++++++++++++++ testing/org-test.el | 1 - 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..2334034 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,24 @@ +language: python +python: + - "2.7" +env: + matrix: + - EMACS=emacs + - EMACS=emacs24 + - EMACS=emacs-snapshot +before_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:cassou/emacs && + sudo apt-get update -qq && + sudo apt-get install -qq + emacs-snapshot-el emacs-snapshot-gtk emacs-snapshot; + fi + - pip install virtualenv-emacs + - virtualenv_install_emacs --with-emacs=`which "$EMACS"` +script: + make test diff --git a/testing/org-test.el b/testing/org-test.el index 0c9ca58..5f8dd52 100644 --- a/testing/org-test.el +++ b/testing/org-test.el @@ -79,7 +79,6 @@ "Parent major mode from which special major modes should inherit." (setq buffer-read-only t))) (require 'ert) - (require 'ert-x) (when (file-exists-p (expand-file-name "jump/jump.el" org-test-dir)) (require 'jump) -- 1.8.1.5