Merge pull request #7 from gongo/use_ert-runner

Use ert-runner
gongo · Oct 7, 2014 · 84bef96 · 84bef96
2 parents f8e7532 + 05ade74
commit 84bef96
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/.ert-runner b/.ert-runner
@@ -0,0 +1 @@
+-L .
diff --git a/.travis.yml b/.travis.yml
@@ -13,5 +13,6 @@ before_install:
   - curl -fsSkL --max-time 10 --retry 10 --retry-delay 10 https://raw.github.com/rejeep/evm/master/go | bash
   - evm install emacs-$EMACS_VERSION-bin --use
   - curl -fsSkL --max-time 10 --retry 10 --retry-delay 10 https://raw.github.com/cask/cask/master/go | python
+  - cask install
 script:
-  make test
+  cask exec ert-runner
diff --git a/Cask b/Cask
@@ -4,5 +4,5 @@
 (source gnu)
 
 (development
- (depends-on "ert")
+ (depends-on "ert-runner")
  (depends-on "undercover"))
diff --git a/Makefile b/Makefile
diff --git a/json-reformat-test.el → test/json-reformat-test.el b/json-reformat-test.el → test/json-reformat-test.el
@@ -1,9 +1,3 @@
-(require 'ert)
-(require 'undercover)
-(undercover "json-reformat.el$")
-
-(require 'json-reformat)
-
 (ert-deftest json-reformat-test:indent ()
   (should (string= "" (json-reformat:indent 0)))
   (should (string= "    " (json-reformat:indent 1)))

diff --git a/test/test-helper.el b/test/test-helper.el
@@ -0,0 +1,5 @@
+(require 'ert)
+(require 'undercover)
+(undercover "json-reformat.el$")
+
+(require 'json-reformat)