diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-06-14 08:27:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-14 08:27:23 -0400 |
commit | 5f4074ada84fdd25ef6751221da630df8fcab346 (patch) | |
tree | 9ad4f3a853f16ff40b3aa388b70ae07e92c53fe2 | |
parent | 631f6bef8d2a91423228b0dfedbacbcf37947b7c (diff) | |
parent | 6d3c3e2fe376fdd5d4c015d22cfa4df5ad2f9211 (diff) | |
download | servo-5f4074ada84fdd25ef6751221da630df8fcab346.tar.gz servo-5f4074ada84fdd25ef6751221da630df8fcab346.zip |
Auto merge of #23565 - georgeroman:reintroduce_parallelism_in_bluetooth_tests_continued, r=jdm
Finish reintroducing parallelism in bluetooth tests
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23565)
<!-- Reviewable:end -->
-rw-r--r-- | etc/ci/buildbot_steps.yml | 2 | ||||
-rwxr-xr-x | etc/ci/update-wpt-checkout | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml index a291a0aa319..f65351dccc0 100644 --- a/etc/ci/buildbot_steps.yml +++ b/etc/ci/buildbot_steps.yml @@ -56,7 +56,7 @@ linux-rel-wpt: - ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default - ./mach test-wpt --release --binary-arg=--multiprocess --processes 24 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource - ./mach test-wpt --release --product=servodriver --headless tests/wpt/mozilla/tests/mozilla/DOMParser.html tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html tests/wpt/mozilla/tests/css/img_simple.html tests/wpt/mozilla/tests/mozilla/secure.https.html - - ./mach test-wpt --release --processes 1 --product=servodriver --headless --log-raw test-bluetooth.log --log-errorsummary bluetooth-errorsummary.log bluetooth + - ./mach test-wpt --release --product=servodriver --headless --log-raw test-bluetooth.log --log-errorsummary bluetooth-errorsummary.log bluetooth - ./etc/ci/clean_build_artifacts.sh linux-rel-css: diff --git a/etc/ci/update-wpt-checkout b/etc/ci/update-wpt-checkout index 6049ad848c3..46d6d0c076a 100755 --- a/etc/ci/update-wpt-checkout +++ b/etc/ci/update-wpt-checkout @@ -67,7 +67,7 @@ function unsafe_run_tests() { --always-succeed || return 1 # Run the bluetooth testsuite, which uses the webdriver test harness. - ./mach test-wpt --release --processes 1 --product=servodriver --headless \ + ./mach test-wpt --release --product=servodriver --headless \ --log-raw "${2}" /bluetooth --always-succeed || return 2 } |