mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-05 07:41:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Meta: Ensure wptreport browser_version field is always populated

Browse source 
This was previously done by passing the `LADYBIRD_GIT_VERSION`
environment variable to `wpt`, but this doesn't work in chunked mode.
This commit is contained in:
Tim Ledbetter 2025-05-14 07:21:25 +01:00 • committed by Jelle Raaijmakers
commit 7f4916b806
Notes: github-actions[bot] 2025-05-15 12:03:57 +00:00
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Meta/WPT.sh
View file

@ -470,21 +470,19 @@ run_wpt_chunked() {
fi fi
if [ "$procs" -le 1 ]; then if [ "$procs" -le 1 ]; then
command=(./wpt run -f --processes="${WPT_PROCESSES}" "$@") command=(./wpt run -f --browser-version="1.0-$(ladybird_git_hash)" --processes="${WPT_PROCESSES}" "$@")
echo "${command[@]}" echo "${command[@]}"
"${command[@]}" "${command[@]}"
return return
fi fi
concurrency=$(( $(nproc) * 2 / procs )) concurrency=$(( $(nproc) * 2 / procs ))
LADYBIRD_GIT_VERSION="$(ladybird_git_hash)"
echo "Preparing the venv setup..." echo "Preparing the venv setup..."
base_venv="${BUILD_DIR}/wpt-prep/_venv" base_venv="${BUILD_DIR}/wpt-prep/_venv"
./wpt --venv "$base_venv" run "${WPT_ARGS[@]}" ladybird THIS_TEST_CANNOT_POSSIBLY_EXIST || true ./wpt --venv "$base_venv" run "${WPT_ARGS[@]}" ladybird THIS_TEST_CANNOT_POSSIBLY_EXIST || true
echo "Launching $procs chunked instances (concurrency=$concurrency each)" echo "Launching $procs chunked instances (concurrency=$concurrency each)"
export LADYBIRD_GIT_VERSION
local logs=() local logs=()
local run_start_time local run_start_time
run_start_time=$(date +"%Y%m%d%H%M%S") run_start_time=$(date +"%Y%m%d%H%M%S")
@ -506,9 +504,10 @@ run_wpt_chunked() {
--total-chunks="$procs" \ --total-chunks="$procs" \
--chunk-type=hash \ --chunk-type=hash \
-f \ -f \
--browser-version="1.0-$(ladybird_git_hash)"
--processes="$concurrency" \ --processes="$concurrency" \
"$@") "$@")
echo "[INSTANCE $i / ns wptns$i] LADYBIRD_GIT_VERSION=$LADYBIRD_GIT_VERSION ${command[*]}" echo "[INSTANCE $i / ns wptns$i] ${command[*]}"
instance_run "$i" "$rundir" script -q "$logpath" -c "$(printf "%q " "${command[@]}")" &>/dev/null & instance_run "$i" "$rundir" script -q "$logpath" -c "$(printf "%q " "${command[@]}")" &>/dev/null &
done done