diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-03-19 18:07:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 18:07:21 -0400 |
| commit | c57e246f3d76d141431fc292e3f559e5f2af339a (patch) | |
| tree | 3527094fa31f29e5b4e3c39d8f063ace02e0faa6 | |
| parent | 1634f4e6ed6b2c1f3153fda36e69359946e6b5c5 (diff) | |
| parent | 2b46d557aba3c5c8bf8cc60513c27f1b1b660ca0 (diff) | |
| download | servo-c57e246f3d76d141431fc292e3f559e5f2af339a.tar.gz servo-c57e246f3d76d141431fc292e3f559e5f2af339a.zip | |
Auto merge of #25989 - servo:jdm-patch-45, r=SimonSapin
Reuse layout-2013 WPT results with layout-2020 when syncing.
This should fix #25666, or at least the most common failure case. If new test results actually have different behaviour between the layout-2013 and layout-2020 engines there's not much we can do without a proper build with 2020 enabled.
| -rwxr-xr-x | etc/ci/update-wpt-checkout | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/ci/update-wpt-checkout b/etc/ci/update-wpt-checkout index a796930e007..07ef5d60d6b 100755 --- a/etc/ci/update-wpt-checkout +++ b/etc/ci/update-wpt-checkout @@ -83,8 +83,10 @@ function unsafe_run_tests() { # last commit with the new results. function unsafe_update_metadata() { ./mach update-wpt "${1}" "${2}" "${3}" || return 1 + # Hope that any test result changes from layout-2013 are also applicable to layout-2020. + ./mach update-wpt --layout-2020 "${1}" "${2}" "${3}" || return 2 # Ensure any new directories or ini files are included in these changes. - git add tests/wpt/metadata tests/wpt/mozilla/meta || return 2 + git add tests/wpt/metadata tests/wpt/metadata-layout-2020 tests/wpt/mozilla/meta || return 3 # Merge all changes with the existing commit. git commit -a --amend --no-edit || return 3 } |