Signed-off-by: Fumihiko Kakuma <[email protected]>
---
.travis.yml | 43 ++++++++++++++++++++++++++++---------------
tox.ini | 3 +++
2 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 82d194f..51bde54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,36 @@
language: python
-python:
- - "3.5" # Python 3.5 still needs to be installed on Travis-CI
-services:
- - docker
-
-env:
- - TOX_ENV=py27
- - TOX_ENV=py34
- - TOX_ENV=py35
- - TOX_ENV=pypy26
- - TOX_ENV=pep8
+matrix:
+ include:
+ - env: TOX_ENV=py27
+ python: "2.7"
+ services: docker
+ sudo: required
+ script:
+ - NOSE_VERBOSE=0 tox -e $TOX_ENV
+ - tox -e scenario
+ - env: TOX_ENV=py34
+ python: "3.4"
+ services: docker
+ sudo: required
+ script:
+ - NOSE_VERBOSE=0 tox -e $TOX_ENV
+ - tox -e scenario
+ - env: TOX_ENV=py35
+ python: "3.5"
+ script:
+ - NOSE_VERBOSE=0 tox -e $TOX_ENV
+ - env: TOX_ENV=pypy26
+ python: "3.5"
+ script:
+ - NOSE_VERBOSE=0 tox -e $TOX_ENV
+ - env: TOX_ENV=pep8
+ python: "3.5"
+ script:
+ - NOSE_VERBOSE=0 tox -e $TOX_ENV
install:
- pip install tox coveralls
-sudo: required
-script:
- - NOSE_VERBOSE=0 tox -e $TOX_ENV
-
after_success:
- coveralls
diff --git a/tox.ini b/tox.ini
index ae9fd33..964c02c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,9 @@ usedevelop = True
passenv= NOSE_VERBOSE
commands =
coverage run --source=ryu ryu/tests/run_tests.py '{posargs}'
+
+[testenv:scenario]
+commands =
bash ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh
python ryu/tests/integrated/run_test.py
--
1.9.1
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
