Move "extra" WPT testing to its own task (chunk "zero")

This commit is contained in:
Simon Sapin 2019-11-16 19:48:34 +01:00
parent dfa78986a6
commit 1ca9c5b96b

View file

@ -645,7 +645,7 @@ def macos_wpt():
def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes, def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes,
repo_dir, chunks="all", repo_kwargs={}): repo_dir, chunks="all", repo_kwargs={}):
if chunks == "all": if chunks == "all":
chunks = [n + 1 for n in range(total_chunks)] chunks = range(total_chunks + 1)
for this_chunk in chunks: for this_chunk in chunks:
task = ( task = (
make_chunk_task("WPT chunk %s / %s" % (this_chunk, total_chunks)) make_chunk_task("WPT chunk %s / %s" % (this_chunk, total_chunks))
@ -662,9 +662,10 @@ def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes,
GST_DEBUG="3", GST_DEBUG="3",
) )
) )
if this_chunk == chunks[-1]: # `test-wpt` is piped into `cat` so that stdout is not a TTY
task.name += " + extra" # and wptrunner does not use "interactive mode" formatting:
task.extra["treeherder"]["symbol"] += "+" # https://github.com/servo/servo/issues/22438
if this_chunk == 0:
task.with_script(""" task.with_script("""
./mach test-wpt-failure ./mach test-wpt-failure
time ./mach test-wpt --release --binary-arg=--multiprocess \ time ./mach test-wpt --release --binary-arg=--multiprocess \
@ -697,26 +698,24 @@ def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes,
--tracker-api default \ --tracker-api default \
--reporter-api default --reporter-api default
""") """)
# `test-wpt` is piped into `cat` so that stdout is not a TTY else:
# and wptrunner does not use "interactive mode" formatting: task.with_script("""
# https://github.com/servo/servo/issues/22438 ./mach test-wpt \
task.with_script(""" --release \
./mach test-wpt \ --processes $PROCESSES \
--release \ --total-chunks "$TOTAL_CHUNKS" \
--processes $PROCESSES \ --this-chunk "$THIS_CHUNK" \
--total-chunks "$TOTAL_CHUNKS" \ --log-raw test-wpt.log \
--this-chunk "$THIS_CHUNK" \ --log-errorsummary wpt-errorsummary.log \
--log-raw test-wpt.log \ --always-succeed \
--log-errorsummary wpt-errorsummary.log \ | cat
--always-succeed \ ./mach filter-intermittents \
| cat wpt-errorsummary.log \
./mach filter-intermittents \ --log-intermittents intermittents.log \
wpt-errorsummary.log \ --log-filteredsummary filtered-wpt-errorsummary.log \
--log-intermittents intermittents.log \ --tracker-api default \
--log-filteredsummary filtered-wpt-errorsummary.log \ --reporter-api default
--tracker-api default \ """)
--reporter-api default
""")
task.with_artifacts(*[ task.with_artifacts(*[
"%s/%s" % (repo_dir, word) "%s/%s" % (repo_dir, word)
for script in task.scripts for script in task.scripts