diff --git a/etc/ci/update-wpt-checkout b/etc/ci/update-wpt-checkout index 0a550a51c3c..8e3c313340e 100755 --- a/etc/ci/update-wpt-checkout +++ b/etc/ci/update-wpt-checkout @@ -10,6 +10,7 @@ set -o pipefail REMOTE_NAME=sync-fork LOG_FILE=test-wpt.log +BLUETOOTH_LOG_FILE=test-wpt-bluetooth.log CURRENT_DATE=$(date +"%d-%m-%Y") BRANCH_NAME="wpt_update" REMOTE_BRANCH_NAME="wpt_update_${CURRENT_DATE}" @@ -64,12 +65,16 @@ function unsafe_run_tests() { # Run the full testsuite and record the new test results. ./mach test-wpt --release --processes 6 --log-raw "${1}" \ --always-succeed || return 1 + + # Run the bluetooth testsuite, which uses the webdriver test harness. + ./mach test-wpt --release --processes 1 --product=servodriver --headless \ + --log-raw "${2}" --always-succeed || return 2 } # Using an existing log file, update the expected test results and amend the # last commit with the new results. function unsafe_update_metadata() { - ./mach update-wpt "${1}" || return 1 + ./mach update-wpt "${1}" "${2}" || return 1 # Ensure any new directories or ini files are included in these changes. git add tests/wpt/metadata tests/wpt/mozilla/meta || return 2 # Merge all changes with the existing commit. @@ -129,11 +134,11 @@ function pull_from_upstream() { } function run_tests() { - unsafe_run_tests "${1}" || { code="${?}"; cleanup; return "${code}"; } + unsafe_run_tests "${1}" "${2}" || { code="${?}"; cleanup; return "${code}"; } } function update_metadata() { - unsafe_update_metadata "${1}" || { code="${?}"; cleanup; return "${code}"; } + unsafe_update_metadata "${1}" "${2}" || { code="${?}"; cleanup; return "${code}"; } } function open_pull_request() { @@ -143,8 +148,8 @@ function open_pull_request() { SCRIPT_NAME="${0}" function update_test_results() { - run_tests "${LOG_FILE}" - update_metadata "${LOG_FILE}" + run_tests "${LOG_FILE}" "${BLUETOOTH_LOG_FILE}" + update_metadata "${LOG_FILE}" "${BLUETOOTH_LOG_FILE}" } function fetch_upstream_changes() { diff --git a/resources/user-agent-js/00.example.js b/resources/user-agent-js/00.example.js index c024b0f6a48..d22d341b1bd 100644 --- a/resources/user-agent-js/00.example.js +++ b/resources/user-agent-js/00.example.js @@ -3,3 +3,4 @@ // Files are sorted alphabetically. When committing polyfills // order them with numbers, e.g. `01.innerhtml.js` will be executed before // `05.jquery.js` +WheelEvent = { DOM_DELTA_PIXEL: 5, DOM_DELTA_LINE: 5, DOM_DELTA_PAGE: 5 }; diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 85b062a1178..ec688894cbe 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -669845,7 +669845,7 @@ "support" ], "interfaces/animation-worklet.idl": [ - "58d0bc51a67be51d1d3fab75096b71feef8dea9b", + "159cabd09cd0b425c933cdfde58c46c8f14c9819", "support" ], "interfaces/appmanifest.idl": [ @@ -670289,7 +670289,7 @@ "support" ], "interfaces/web-bluetooth.idl": [ - "c5fd30cf320ac857d34758558110c972770fd428", + "183f77326051ad116785e3a5c371435afd9f7b65", "support" ], "interfaces/web-nfc.idl": [ @@ -670345,7 +670345,7 @@ "support" ], "interfaces/webxr.idl": [ - "6a45597594631eb458c459e3d8bf6cca43fbd06c", + "9e02becb76f70dc7c675568e070d71ab15008a9e", "support" ], "interfaces/worklets.idl": [ diff --git a/tests/wpt/metadata/bluetooth/idl/idlharness.tentative.https.window.js.ini b/tests/wpt/metadata/bluetooth/idl/idlharness.tentative.https.window.js.ini index b83e1b347a5..e85766f5e1d 100644 --- a/tests/wpt/metadata/bluetooth/idl/idlharness.tentative.https.window.js.ini +++ b/tests/wpt/metadata/bluetooth/idl/idlharness.tentative.https.window.js.ini @@ -212,3 +212,8 @@ [Bluetooth interface: attribute oncharacteristicvaluechanged] expected: FAIL + [BluetoothRemoteGATTCharacteristic interface: operation writeValueWithResponse(BufferSource)] + expected: FAIL + + [BluetoothRemoteGATTCharacteristic interface: operation writeValueWithoutResponse(BufferSource)] + expected: FAIL \ No newline at end of file diff --git a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini index 468859377f2..b75e1104a28 100644 --- a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini +++ b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini @@ -218,9 +218,6 @@ [Matching font-weight: '501' should prefer '500' over '450 460'] expected: FAIL - [Matching font-weight: '501' should prefer '501' over '502 510'] - expected: FAIL - [Matching font-style: 'italic' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg'] expected: FAIL @@ -296,15 +293,9 @@ [Matching font-style: 'oblique 10deg' should prefer 'oblique 5deg' over 'oblique 15deg 20deg'] expected: FAIL - [Matching font-style: 'oblique -10deg' should prefer 'oblique -50deg -40deg' over 'italic'] - expected: FAIL - [Matching font-weight: '400' should prefer '400' over '450 460'] expected: FAIL - [Matching font-style: 'oblique 20deg' should prefer 'oblique 0deg' over 'oblique -50deg -20deg'] - expected: FAIL - [Matching font-style: 'italic' should prefer 'oblique 0deg' over 'oblique -60deg -30deg'] expected: FAIL diff --git a/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini b/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini index 323528d3385..8850ec200da 100644 --- a/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini +++ b/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini @@ -74,6 +74,3 @@ [opacity end] expected: FAIL - [letter-spacing end] - expected: FAIL - diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini index 72022cb4ff0..18f786d4963 100644 --- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini +++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini @@ -22,7 +22,7 @@ expected: NOTRUN [