Let WPT commands take the --legacy-layout argument (#30239)

This also prints a better message when starting tests.
This commit is contained in:
Martin Robinson 2023-08-30 13:46:57 +02:00 committed by GitHub
parent 17dec241db
commit 30dbc46d17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 29 deletions

View file

@ -12,6 +12,7 @@ on:
env:
RUST_BACKTRACE: 1
SHELL: /bin/bash
WPT_COMMAND_LINE_ARG: "${{ inputs.layout == 'layout-2013' && '--legacy-layout' || '' }}"
jobs:
linux-wpt:
@ -65,7 +66,7 @@ jobs:
- name: Run tests
if: ${{ inputs.wpt != 'sync' }}
run: |
python3 ./mach test-wpt --with-${{ inputs.layout }} \
python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG \
--release --processes $(nproc) --timeout-multiplier 2 \
--total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
--log-raw test-wpt.${{ matrix.chunk_id }}.log \
@ -77,7 +78,7 @@ jobs:
- name: Run tests (sync)
if: ${{ inputs.wpt == 'sync' }}
run: |
python3 ./mach test-wpt --with-${{ inputs.layout }} \
python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG \
--release --processes $(nproc) --timeout-multiplier 2 \
--total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
--log-raw test-wpt.${{ matrix.chunk_id }}.log \

View file

@ -10,6 +10,7 @@ on:
env:
RUST_BACKTRACE: 1
SHELL: /bin/bash
WPT_COMMAND_LINE_ARG: "${{ inputs.layout == 'layout-2013' && '--legacy-layout' || '' }}"
jobs:
mac-wpt:
@ -45,7 +46,7 @@ jobs:
run: python3 ./mach smoketest --release
- name: Run tests
run: |
python3 ./mach test-wpt --with-${{ inputs.layout }} \
python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG \
--release --processes $(sysctl -n hw.logicalcpu) --timeout-multiplier 8 \
--total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
--log-raw test-wpt.${{ matrix.chunk_id }}.log \

View file

@ -52,8 +52,8 @@ jobs:
export CURRENT_DATE=$(date +"%d-%m-%Y")
echo $CURRENT_DATE
echo "CURRENT_DATE=$CURRENT_DATE" >> $GITHUB_ENV
./mach update-wpt --layout-2013 wpt-logs-linux-layout-2013/test-wpt.*.log
./mach update-wpt --layout-2020 wpt-logs-linux-layout-2020/test-wpt.*.log
./mach update-wpt --legacy-layout wpt-logs-linux-layout-2013/test-wpt.*.log
./mach update-wpt wpt-logs-linux-layout-2020/test-wpt.*.log
git add tests/wpt/meta tests/wpt/meta-legacy-layout
git commit -a --amend --no-edit
- name: Push changes