Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Run bluetooth tests as part of WPT sync.

Browse source
This commit is contained in:
Josh Matthews 2019-04-22 11:41:01 -04:00
parent a7432be1b3
commit 7922359c79
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
etc/ci/update-wpt-checkout
View file

@ -10,6 +10,7 @@ set -o pipefail
REMOTE_NAME=sync-fork REMOTE_NAME=sync-fork
LOG_FILE=test-wpt.log LOG_FILE=test-wpt.log
BLUETOOTH_LOG_FILE=test-wpt-bluetooth.log
CURRENT_DATE=$(date +"%d-%m-%Y") CURRENT_DATE=$(date +"%d-%m-%Y")
BRANCH_NAME="wpt_update" BRANCH_NAME="wpt_update"
REMOTE_BRANCH_NAME="wpt_update_${CURRENT_DATE}" 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. # Run the full testsuite and record the new test results.
./mach test-wpt --release --processes 6 --log-raw "${1}" \ ./mach test-wpt --release --processes 6 --log-raw "${1}" \
--always-succeed || return 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 # Using an existing log file, update the expected test results and amend the
# last commit with the new results. # last commit with the new results.
function unsafe_update_metadata() { 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. # 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/mozilla/meta || return 2
# Merge all changes with the existing commit. # Merge all changes with the existing commit.
@ -129,11 +134,11 @@ function pull_from_upstream() {
} }
function run_tests() { function run_tests() {
unsafe_run_tests "${1}" || { code="${?}"; cleanup; return "${code}"; } unsafe_run_tests "${1}" "${2}" || { code="${?}"; cleanup; return "${code}"; }
} }
function update_metadata() { function update_metadata() {
unsafe_update_metadata "${1}" || { code="${?}"; cleanup; return "${code}"; } unsafe_update_metadata "${1}" "${2}" || { code="${?}"; cleanup; return "${code}"; }
} }
function open_pull_request() { function open_pull_request() {
@ -143,8 +148,8 @@ function open_pull_request() {
SCRIPT_NAME="${0}" SCRIPT_NAME="${0}"
function update_test_results() { function update_test_results() {
run_tests "${LOG_FILE}" run_tests "${LOG_FILE}" "${BLUETOOTH_LOG_FILE}"
update_metadata "${LOG_FILE}" update_metadata "${LOG_FILE}" "${BLUETOOTH_LOG_FILE}"
} }
function fetch_upstream_changes() { function fetch_upstream_changes() {