mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
Run wdspec tests in a different job
This commit is contained in:
parent
5f4074ada8
commit
2e0556c503
134 changed files with 1279 additions and 21 deletions
|
@ -57,6 +57,7 @@ linux-rel-wpt:
|
|||
- ./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 --product=servodriver --headless --log-raw test-bluetooth.log --log-errorsummary bluetooth-errorsummary.log bluetooth
|
||||
- ./mach test-wpt --release --headless --timeout-multiplier=4 --log-raw test-wdspec.log --log-errorsummary wdspec-errorsummary.log webdriver
|
||||
- ./etc/ci/clean_build_artifacts.sh
|
||||
|
||||
linux-rel-css:
|
||||
|
|
|
@ -11,6 +11,7 @@ set -o pipefail
|
|||
REMOTE_NAME=sync-fork
|
||||
LOG_FILE=test-wpt.log
|
||||
BLUETOOTH_LOG_FILE=test-wpt-bluetooth.log
|
||||
WDSPEC_LOG_FILE=test-wpt-wdspec.log
|
||||
CURRENT_DATE=$(date +"%d-%m-%Y")
|
||||
BRANCH_NAME="wpt_update"
|
||||
REMOTE_BRANCH_NAME="wpt_update_${CURRENT_DATE}"
|
||||
|
@ -69,12 +70,16 @@ function unsafe_run_tests() {
|
|||
# Run the bluetooth testsuite, which uses the webdriver test harness.
|
||||
./mach test-wpt --release --product=servodriver --headless \
|
||||
--log-raw "${2}" /bluetooth --always-succeed || return 2
|
||||
|
||||
# Run the wdspec testsuite
|
||||
./mach test-wpt --release --timeout-multiplier=4 --log-raw "${3}" /webdriver \
|
||||
--always-succeed || return 3
|
||||
}
|
||||
|
||||
# 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}" "${2}" || return 1
|
||||
./mach update-wpt "${1}" "${2}" "${3}" || 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.
|
||||
|
@ -139,11 +144,11 @@ function pull_from_upstream() {
|
|||
}
|
||||
|
||||
function run_tests() {
|
||||
unsafe_run_tests "${1}" "${2}" || { code="${?}"; cleanup; return "${code}"; }
|
||||
unsafe_run_tests "${1}" "${2}" "${3}" || { code="${?}"; cleanup; return "${code}"; }
|
||||
}
|
||||
|
||||
function update_metadata() {
|
||||
unsafe_update_metadata "${1}" "${2}" || { code="${?}"; cleanup; return "${code}"; }
|
||||
unsafe_update_metadata "${1}" "${2}" "${3}" || { code="${?}"; cleanup; return "${code}"; }
|
||||
}
|
||||
|
||||
function open_pull_request() {
|
||||
|
@ -153,8 +158,8 @@ function open_pull_request() {
|
|||
SCRIPT_NAME="${0}"
|
||||
|
||||
function update_test_results() {
|
||||
run_tests "${LOG_FILE}" "${BLUETOOTH_LOG_FILE}"
|
||||
update_metadata "${LOG_FILE}" "${BLUETOOTH_LOG_FILE}"
|
||||
run_tests "${LOG_FILE}" "${BLUETOOTH_LOG_FILE}" "${WDSPEC_LOG_FILE}"
|
||||
update_metadata "${LOG_FILE}" "${BLUETOOTH_LOG_FILE}" "${WDSPEC_LOG_FILE}"
|
||||
}
|
||||
|
||||
function fetch_upstream_changes() {
|
||||
|
|
|
@ -613,6 +613,11 @@ def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes,
|
|||
--log-errorsummary bluetooth-errorsummary.log \
|
||||
bluetooth \
|
||||
| cat
|
||||
time ./mach test-wpt --release --processes $PROCESSES --timeout-multiplier=4 \
|
||||
--headless --log-raw test-wdspec.log \
|
||||
--log-errorsummary wdspec-errorsummary.log \
|
||||
webdriver \
|
||||
| cat
|
||||
""")
|
||||
# `test-wpt` is piped into `cat` so that stdout is not a TTY
|
||||
# and wptrunner does not use "interactive mode" formatting:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue