Skip to content

Commit

Permalink
grouping android tests in one job
Browse files Browse the repository at this point in the history
  • Loading branch information
sebv committed Nov 14, 2013
1 parent 79ce663 commit 6da953b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
26 changes: 13 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ env:
- HTTP_RETRIES=10
- HTTP_RETRY_DELAY=10000
- DEBUG_CONNECTION=1
matrix:
- BROWSER=multi
- BROWSER=explorer
- BROWSER=chrome
- BROWSER=firefox
- BROWSER=iphone
- BROWSER=ipad
- BROWSER=android_phone
- BROWSER=android_tablet
# matrix:
# - BROWSER=multi
# - BROWSER=explorer
# - BROWSER=chrome
# - BROWSER=firefox
# - BROWSER=iphone
# - BROWSER=ipad
matrix:
include:
- node_js: "0.11"
env: BROWSER=chrome
- node_js: "0.8"
env: BROWSER=chrome
# - node_js: "0.11"
# env: BROWSER=chrome
# - node_js: "0.8"
# env: BROWSER=chrome
- node_js: "0.10"
env: BROWSER=all_androids
before_script:
- ./node_modules/.bin/install_sauce_connect
- ./node_modules/.bin/travis_start_sauce_connect
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ test_travis:
ifeq ($(MULTI),true)
make test_unit
make test_midway_sauce_connect
else ifeq ($(BROWSER),all_androids)
BROWSER=android_tablet make test_midway_mobile_sauce_connect
BROWSER=android_phone make test_midway_mobile_sauce_connect
else ifeq ($(MOBILE),true)
make test_midway_mobile_sauce_connect
else
Expand Down

0 comments on commit 6da953b

Please sign in to comment.