mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-23 09:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Meta: Only update hosts file when necessary in WPT.sh

Browse source 
Previously, the hosts file was updated at the same time the WPT repo
was cloned, but updating the hosts file is only necessary for commands
that start the WPT test runner.
This commit is contained in:
Tim Ledbetter 2025-09-07 09:19:04 +01:00 • committed by Tim Flynn
commit 21082f5002
Notes: github-actions[bot] 2025-09-07 12:15:37 +00:00
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Meta/WPT.sh
View file

@ -240,11 +240,6 @@ ensure_wpt_repository() {
if [ ! -d .git ]; then if [ ! -d .git ]; then
git clone --depth 1 "${WPT_REPOSITORY_URL}" "${WPT_SOURCE_DIR}" git clone --depth 1 "${WPT_REPOSITORY_URL}" "${WPT_SOURCE_DIR}"
fi fi
# Update hosts file if needed
if [ "$(comm -13 <(sort -u /etc/hosts) <(./wpt make-hosts-file | sort -u) | wc -l)" -gt 0 ]; then
./wpt make-hosts-file | sudo_and_ask "Appending wpt hosts to /etc/hosts" tee -a /etc/hosts
fi
popd > /dev/null popd > /dev/null
} }
@ -533,6 +528,14 @@ absolutize_log_args() {
done done
} }
update_hosts_file_if_needed() {
pushd "${WPT_SOURCE_DIR}" > /dev/null
if [ "$(comm -13 <(sort -u /etc/hosts) <(./wpt make-hosts-file | sort -u) | wc -l)" -gt 0 ]; then
./wpt make-hosts-file | sudo_and_ask "Appending wpt hosts to /etc/hosts" tee -a /etc/hosts
fi
popd > /dev/null
}
execute_wpt() { execute_wpt() {
local procs local procs
@ -557,12 +560,14 @@ execute_wpt() {
run_wpt() { run_wpt() {
ensure_wpt_repository ensure_wpt_repository
build_ladybird_and_webdriver build_ladybird_and_webdriver
update_hosts_file_if_needed
execute_wpt "${@}" execute_wpt "${@}"
} }
serve_wpt() serve_wpt()
{ {
ensure_wpt_repository ensure_wpt_repository
update_hosts_file_if_needed
pushd "${WPT_SOURCE_DIR}" > /dev/null pushd "${WPT_SOURCE_DIR}" > /dev/null
./wpt serve ./wpt serve
@ -735,6 +740,7 @@ compare_wpt() {
popd > /dev/null popd > /dev/null
WPT_ARGS+=( "--metadata=${METADATA_DIR}" ) WPT_ARGS+=( "--metadata=${METADATA_DIR}" )
build_ladybird_and_webdriver build_ladybird_and_webdriver
update_hosts_file_if_needed
execute_wpt "${@}" execute_wpt "${@}"
rm -rf "${METADATA_DIR}" rm -rf "${METADATA_DIR}"
} }