X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=.travis.yml;h=92f326860f660fa67a79b31385c6b481dd8276c5;hb=7a6c204fcb6ba5a1a5149ea7a3c186eab87fc7e4;hp=136c339f0cf9058fd9811077c6257afc553e30cf;hpb=5b6a74856babce30e9e72701259f790322281d3a;p=youtube-dl

diff --git a/.travis.yml b/.travis.yml
index 136c339f0..92f326860 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,16 +6,22 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
+  - "pypy"
+  - "pypy3"
 sudo: false
-install:
-  - bash ./devscripts/install_srelay.sh
-  - export PATH=$PATH:$(pwd)/tmp/srelay-0.4.8b6
-script: nosetests test --verbose
-notifications:
-  email:
-    - filippo.valsorda@gmail.com
-    - yasoob.khld@gmail.com
-#  irc:
-#    channels:
-#      - "irc.freenode.org#youtube-dl"
-#    skip_join: true
+env:
+  - YTDL_TEST_SET=core
+  - YTDL_TEST_SET=download
+matrix:
+  include:
+    - env: JYTHON=true; YTDL_TEST_SET=core
+    - env: JYTHON=true; YTDL_TEST_SET=download
+  fast_finish: true
+  allow_failures:
+    - env: YTDL_TEST_SET=download
+    - env: JYTHON=true; YTDL_TEST_SET=core
+    - env: JYTHON=true; YTDL_TEST_SET=download
+before_install:
+  - if [ "$JYTHON" == "true" ]; then ./devscripts/install_jython.sh; export PATH="$HOME/jython/bin:$PATH"; fi
+script: ./devscripts/run_tests.sh