summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-07-06 10:40:25 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-07-06 10:40:25 +0200
commitefcab7c7d5fc0bb3367f188f8a3d01c3f9664749 (patch)
tree31c18556f895cded7ec790bb38c4b9148aa6f6bb
parente716183e75805fe8a6166094ba53e4e54dc82818 (diff)
dont run acceptance tests, needs owncloud instnace
-rw-r--r--.travis.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index e140245b3..cf0838404 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,6 @@ before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
-script: make tests
+script:
+ - make javascript-tests
+ - make unit-tests