Skip to content

Commit 6200507

Browse files
committed
Speed up JS tests by running them in parallel
1 parent e7a6bb0 commit 6200507

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ matrix:
4747
- env: CHROME=1 TASK=test_chrome
4848
<<: *java
4949
<<: *chrome
50-
- env: TASK="//javascript/atoms:atoms //javascript/webdriver:all_js //javascript/ie-driver:atoms //javascript/chrome-driver:atoms //javascript/android-atoms:atoms ios_driver"
50+
- env: BUCK="//javascript/atoms:atoms //javascript/webdriver:all_js //javascript/ie-driver:atoms //javascript/chrome-driver:atoms //javascript/android-atoms:atoms ios_driver"
5151
<<: *java
5252
- env: TOXENV=flake8
5353
<<: *python
@@ -66,14 +66,16 @@ matrix:
6666
<<: *python
6767
<<: *firefox-nightly
6868
include:
69-
- env: BUCK="build selenium-server-standalone java-small-tests chrome-test firefox-test legacy-firefox-test grid-test htmlunit-test ie-test opera-test java-tests"
69+
- env: TASK="calcdeps"
70+
<<: *java
71+
- env: BUCK="build selenium-server-standalone java-small-tests chrome-test firefox-test legacy-firefox-test grid-test htmlunit-test ie-test opera-test java-small-tests"
7072
<<: *java
7173
- env: BUCK="test //java/client/test/org/openqa/selenium/atoms:test"
7274
<<: *java
73-
- env: CHROME=1 TASK="calcdeps //javascript/atoms:atoms-chrome:run //javascript/selenium-atoms:selenium-atoms-chrome:run //javascript/selenium-core:selenium-core-chrome:run //javascript/webdriver:webdriver-chrome:run"
75+
- env: CHROME=1 TASK="calcdeps" BUCK="test //javascript/atoms:atoms-chrome //javascript/selenium-atoms:selenium-atoms-chrome //javascript/selenium-core:selenium-core-chrome //javascript/webdriver:webdriver-chrome"
7476
<<: *java
7577
<<: *chrome
76-
- env: MARIONETTE=1 TASK="calcdeps //javascript/atoms:atoms-firefox:run //javascript/webdriver:webdriver-firefox:run //javascript/selenium-atoms:selenium-atoms-firefox:run //javascript/selenium-core:selenium-core-firefox:run"
78+
- env: MARIONETTE=1 TASK="calcdeps" BUCK="test //javascript/atoms:atoms-firefox //javascript/webdriver:webdriver-firefox //javascript/selenium-atoms:selenium-atoms-firefox //javascript/selenium-core:selenium-core-firefox"
7779
<<: *java
7880
<<: *firefox-latest
7981
- env: BUCK="test legacy-firefox-test"

scripts/travis/script.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ if [[ ! -z $TOXENV ]]; then
1212
tox -c py/tox.ini
1313
fi
1414

15-
if [[ ! -z "$BUCK" ]]; then
16-
./buckw $BUCK
17-
fi
18-
15+
# Ordering matters here. We want rake tasks to run first
1916
if [[ ! -z $TASK ]]; then
2017
./go $TASK
2118
fi
19+
20+
if [[ ! -z "$BUCK" ]]; then
21+
./buckw $BUCK
22+
fi

0 commit comments

Comments
 (0)