2018-08-09 14:00:02 +00:00
|
|
|
# Copyright 2018 The Chromium Authors. All rights reserved.
|
|
|
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
|
|
|
# found in the LICENSE file.
|
|
|
|
|
|
|
|
|
|
# Recipe which runs the PathKit tests using docker
|
|
|
|
|
|
|
|
|
|
DEPS = [
|
|
|
|
|
'checkout',
|
2019-11-05 15:08:23 +00:00
|
|
|
'docker',
|
2019-01-22 23:09:30 +00:00
|
|
|
'env',
|
2018-08-09 14:00:02 +00:00
|
|
|
'infra',
|
|
|
|
|
'recipe_engine/file',
|
|
|
|
|
'recipe_engine/path',
|
|
|
|
|
'recipe_engine/properties',
|
|
|
|
|
'recipe_engine/python',
|
|
|
|
|
'recipe_engine/step',
|
|
|
|
|
'run',
|
|
|
|
|
'vars',
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
|
2019-10-21 16:21:35 +00:00
|
|
|
DOCKER_IMAGE = 'gcr.io/skia-public/gold-karma-chrome-tests:77.0.3865.120_v2'
|
2019-11-05 15:08:23 +00:00
|
|
|
INNER_KARMA_SCRIPT = 'skia/infra/pathkit/test_pathkit.sh'
|
2018-08-09 14:00:02 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
def RunSteps(api):
|
|
|
|
|
api.vars.setup()
|
2019-11-05 15:08:23 +00:00
|
|
|
checkout_root = api.path['start_dir']
|
2018-08-09 14:00:02 +00:00
|
|
|
out_dir = api.vars.swarming_out_dir
|
|
|
|
|
|
2018-08-22 13:35:32 +00:00
|
|
|
# The karma script is configured to look in ./npm-(asmjs|wasm)/bin/test/ for
|
|
|
|
|
# the test files to load, so we must copy them there (see Set up for docker).
|
2018-08-31 14:03:23 +00:00
|
|
|
copy_dest = checkout_root.join('skia', 'modules', 'pathkit',
|
2018-10-16 14:15:01 +00:00
|
|
|
'npm-wasm', 'bin', 'test')
|
2018-08-22 13:35:32 +00:00
|
|
|
if 'asmjs' in api.vars.builder_name:
|
2018-08-31 14:03:23 +00:00
|
|
|
copy_dest = checkout_root.join('skia', 'modules', 'pathkit',
|
2018-10-16 14:15:01 +00:00
|
|
|
'npm-asmjs', 'bin', 'test')
|
2018-08-22 13:35:32 +00:00
|
|
|
|
|
|
|
|
base_dir = api.vars.build_dir
|
|
|
|
|
bundle_name = 'pathkit.wasm'
|
|
|
|
|
if 'asmjs' in api.vars.builder_name:
|
|
|
|
|
# release mode has a .js.mem file that needs to come with.
|
|
|
|
|
# debug mode has an optional .map file, but we can omit that for tests
|
|
|
|
|
if 'Debug' in api.vars.builder_name:
|
|
|
|
|
bundle_name = ''
|
|
|
|
|
else:
|
|
|
|
|
bundle_name = 'pathkit.js.mem'
|
2018-08-09 14:00:02 +00:00
|
|
|
|
2019-11-05 15:08:23 +00:00
|
|
|
copies = {
|
|
|
|
|
base_dir.join('pathkit.js'): copy_dest.join('pathkit.js'),
|
|
|
|
|
}
|
|
|
|
|
if bundle_name:
|
|
|
|
|
copies[base_dir.join(bundle_name)] = copy_dest.join(bundle_name)
|
|
|
|
|
recursive_read = [checkout_root.join('skia')]
|
2018-08-22 13:35:32 +00:00
|
|
|
|
2019-11-05 15:08:23 +00:00
|
|
|
docker_args = None
|
2018-08-22 13:35:32 +00:00
|
|
|
if 'asmjs' in api.vars.builder_name:
|
2019-11-05 15:08:23 +00:00
|
|
|
docker_args = ['--env', 'ASM_JS=1']
|
|
|
|
|
|
|
|
|
|
args = [
|
|
|
|
|
'--builder', api.vars.builder_name,
|
|
|
|
|
'--git_hash', api.properties['revision'],
|
|
|
|
|
'--buildbucket_build_id', api.properties.get('buildbucket_build_id', ''),
|
|
|
|
|
'--bot_id', api.vars.swarming_bot_id,
|
|
|
|
|
'--task_id', api.vars.swarming_task_id,
|
|
|
|
|
'--browser', 'Chrome',
|
|
|
|
|
'--config', api.vars.configuration,
|
|
|
|
|
'--source_type', 'pathkit',
|
|
|
|
|
]
|
2018-08-22 13:35:32 +00:00
|
|
|
if 'asmjs' in api.vars.builder_name:
|
2019-11-05 15:08:23 +00:00
|
|
|
args.extend(['--compiled_language', 'asmjs']) # the default is wasm
|
[PathKit] Adding test infrastructure to support Gold output
To get the gold images out of the browser tests, this adds
testReporter.js and pathkit_aggregator.go. testReporter bundles
up the output as a base64 encoded PNG and sends it over the local
network to pathkit_aggregator. pathkit_aggregator will keep
a list of test results reported in this way and write the PNGs
to /OUT of the container (which is the swarming output directory).
Finally, after all the tests are run, the helper script "test_pathkit.sh"
makes a POST request that creates the JSON file that gold expects
(following the schema https://github.com/google/skia-buildbot/blob/master/golden/docs/INGESTION.md)
pathkit_aggregator takes many command line arguments which control
the keys that Gold needs in order to ingest and handle the data.
Of note, this creates a new set (i.e. source_type) of gold images
called "pathkit", which will distinguish it from "gm", "image", etc.
There will be at least 2 sub-sets of "pathkit" images, "canvas" and "svg",
(representing the 2 output types of PathKit). This CL doesn't
quite handle SVG yet, as it needs a way to convert SVG to PNG in the
browser and will be addressed in a follow up CL.
A "standard" gm is sized at 600x600. This was arbitrarily picked.
Note that the functions in testReporter.js return Promises based
on the fetch requests to post the data. This eliminates the race
condition between the /report_gold_data and /dump_json since
running the karma tests won't return until all reports are done.
Other changes of note:
- Adds go to karma-chrome-tests container.
- renames recipe_modules/build/wasm.py -> pathkit.py to be consistent with
the name of test_pathkit.py and make for easier grepping.
- Increases the JS test timeout to 10s (up from 5) to hopefully avoid
the flakes seen in the Debug Test.
Bug: skia:8216
Change-Id: Ic2cad54f3d19cc16601cf2e9a87798db1e6887a2
Reviewed-on: https://skia-review.googlesource.com/147042
Reviewed-by: Stephan Altmueller <stephana@google.com>
2018-08-15 17:45:28 +00:00
|
|
|
if api.vars.is_trybot:
|
2019-11-05 15:08:23 +00:00
|
|
|
args.extend([
|
[PathKit] Adding test infrastructure to support Gold output
To get the gold images out of the browser tests, this adds
testReporter.js and pathkit_aggregator.go. testReporter bundles
up the output as a base64 encoded PNG and sends it over the local
network to pathkit_aggregator. pathkit_aggregator will keep
a list of test results reported in this way and write the PNGs
to /OUT of the container (which is the swarming output directory).
Finally, after all the tests are run, the helper script "test_pathkit.sh"
makes a POST request that creates the JSON file that gold expects
(following the schema https://github.com/google/skia-buildbot/blob/master/golden/docs/INGESTION.md)
pathkit_aggregator takes many command line arguments which control
the keys that Gold needs in order to ingest and handle the data.
Of note, this creates a new set (i.e. source_type) of gold images
called "pathkit", which will distinguish it from "gm", "image", etc.
There will be at least 2 sub-sets of "pathkit" images, "canvas" and "svg",
(representing the 2 output types of PathKit). This CL doesn't
quite handle SVG yet, as it needs a way to convert SVG to PNG in the
browser and will be addressed in a follow up CL.
A "standard" gm is sized at 600x600. This was arbitrarily picked.
Note that the functions in testReporter.js return Promises based
on the fetch requests to post the data. This eliminates the race
condition between the /report_gold_data and /dump_json since
running the karma tests won't return until all reports are done.
Other changes of note:
- Adds go to karma-chrome-tests container.
- renames recipe_modules/build/wasm.py -> pathkit.py to be consistent with
the name of test_pathkit.py and make for easier grepping.
- Increases the JS test timeout to 10s (up from 5) to hopefully avoid
the flakes seen in the Debug Test.
Bug: skia:8216
Change-Id: Ic2cad54f3d19cc16601cf2e9a87798db1e6887a2
Reviewed-on: https://skia-review.googlesource.com/147042
Reviewed-by: Stephan Altmueller <stephana@google.com>
2018-08-15 17:45:28 +00:00
|
|
|
'--issue', api.vars.issue,
|
|
|
|
|
'--patchset', api.vars.patchset,
|
|
|
|
|
])
|
2018-08-09 14:00:02 +00:00
|
|
|
|
2019-11-05 15:08:23 +00:00
|
|
|
api.docker.run(
|
|
|
|
|
name='Test PathKit with Docker',
|
|
|
|
|
docker_image=DOCKER_IMAGE,
|
|
|
|
|
src_dir=checkout_root,
|
|
|
|
|
out_dir=out_dir,
|
2019-11-20 13:28:20 +00:00
|
|
|
script=checkout_root.join(INNER_KARMA_SCRIPT),
|
2019-11-05 15:08:23 +00:00
|
|
|
args=args,
|
|
|
|
|
docker_args=docker_args,
|
|
|
|
|
copies=copies,
|
|
|
|
|
recursive_read=recursive_read,
|
2019-11-21 17:49:16 +00:00
|
|
|
attempts=3,
|
2019-11-05 15:08:23 +00:00
|
|
|
)
|
2018-08-09 14:00:02 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
def GenTests(api):
|
|
|
|
|
yield (
|
2018-08-22 13:35:32 +00:00
|
|
|
api.test('Test-Debian9-EMCC-GCE-CPU-AVX2-wasm-Debug-All-PathKit') +
|
2018-08-09 14:00:02 +00:00
|
|
|
api.properties(buildername=('Test-Debian9-EMCC-GCE-CPU-AVX2'
|
|
|
|
|
'-wasm-Debug-All-PathKit'),
|
|
|
|
|
repository='https://skia.googlesource.com/skia.git',
|
|
|
|
|
revision='abc123',
|
|
|
|
|
path_config='kitchen',
|
|
|
|
|
swarm_out_dir='[SWARM_OUT_DIR]')
|
|
|
|
|
)
|
[PathKit] Adding test infrastructure to support Gold output
To get the gold images out of the browser tests, this adds
testReporter.js and pathkit_aggregator.go. testReporter bundles
up the output as a base64 encoded PNG and sends it over the local
network to pathkit_aggregator. pathkit_aggregator will keep
a list of test results reported in this way and write the PNGs
to /OUT of the container (which is the swarming output directory).
Finally, after all the tests are run, the helper script "test_pathkit.sh"
makes a POST request that creates the JSON file that gold expects
(following the schema https://github.com/google/skia-buildbot/blob/master/golden/docs/INGESTION.md)
pathkit_aggregator takes many command line arguments which control
the keys that Gold needs in order to ingest and handle the data.
Of note, this creates a new set (i.e. source_type) of gold images
called "pathkit", which will distinguish it from "gm", "image", etc.
There will be at least 2 sub-sets of "pathkit" images, "canvas" and "svg",
(representing the 2 output types of PathKit). This CL doesn't
quite handle SVG yet, as it needs a way to convert SVG to PNG in the
browser and will be addressed in a follow up CL.
A "standard" gm is sized at 600x600. This was arbitrarily picked.
Note that the functions in testReporter.js return Promises based
on the fetch requests to post the data. This eliminates the race
condition between the /report_gold_data and /dump_json since
running the karma tests won't return until all reports are done.
Other changes of note:
- Adds go to karma-chrome-tests container.
- renames recipe_modules/build/wasm.py -> pathkit.py to be consistent with
the name of test_pathkit.py and make for easier grepping.
- Increases the JS test timeout to 10s (up from 5) to hopefully avoid
the flakes seen in the Debug Test.
Bug: skia:8216
Change-Id: Ic2cad54f3d19cc16601cf2e9a87798db1e6887a2
Reviewed-on: https://skia-review.googlesource.com/147042
Reviewed-by: Stephan Altmueller <stephana@google.com>
2018-08-15 17:45:28 +00:00
|
|
|
|
2018-08-22 13:35:32 +00:00
|
|
|
yield (
|
|
|
|
|
api.test('Test-Debian9-EMCC-GCE-CPU-AVX2-asmjs-Debug-All-PathKit') +
|
|
|
|
|
api.properties(buildername=('Test-Debian9-EMCC-GCE-CPU-AVX2'
|
|
|
|
|
'-asmjs-Debug-All-PathKit'),
|
|
|
|
|
repository='https://skia.googlesource.com/skia.git',
|
|
|
|
|
revision='abc123',
|
|
|
|
|
path_config='kitchen',
|
|
|
|
|
swarm_out_dir='[SWARM_OUT_DIR]')
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
yield (
|
|
|
|
|
api.test('Test-Debian9-EMCC-GCE-CPU-AVX2-asmjs-Release-All-PathKit') +
|
|
|
|
|
api.properties(buildername=('Test-Debian9-EMCC-GCE-CPU-AVX2'
|
|
|
|
|
'-asmjs-Release-All-PathKit'),
|
|
|
|
|
repository='https://skia.googlesource.com/skia.git',
|
|
|
|
|
revision='abc123',
|
|
|
|
|
path_config='kitchen',
|
|
|
|
|
swarm_out_dir='[SWARM_OUT_DIR]')
|
|
|
|
|
)
|
|
|
|
|
|
[PathKit] Adding test infrastructure to support Gold output
To get the gold images out of the browser tests, this adds
testReporter.js and pathkit_aggregator.go. testReporter bundles
up the output as a base64 encoded PNG and sends it over the local
network to pathkit_aggregator. pathkit_aggregator will keep
a list of test results reported in this way and write the PNGs
to /OUT of the container (which is the swarming output directory).
Finally, after all the tests are run, the helper script "test_pathkit.sh"
makes a POST request that creates the JSON file that gold expects
(following the schema https://github.com/google/skia-buildbot/blob/master/golden/docs/INGESTION.md)
pathkit_aggregator takes many command line arguments which control
the keys that Gold needs in order to ingest and handle the data.
Of note, this creates a new set (i.e. source_type) of gold images
called "pathkit", which will distinguish it from "gm", "image", etc.
There will be at least 2 sub-sets of "pathkit" images, "canvas" and "svg",
(representing the 2 output types of PathKit). This CL doesn't
quite handle SVG yet, as it needs a way to convert SVG to PNG in the
browser and will be addressed in a follow up CL.
A "standard" gm is sized at 600x600. This was arbitrarily picked.
Note that the functions in testReporter.js return Promises based
on the fetch requests to post the data. This eliminates the race
condition between the /report_gold_data and /dump_json since
running the karma tests won't return until all reports are done.
Other changes of note:
- Adds go to karma-chrome-tests container.
- renames recipe_modules/build/wasm.py -> pathkit.py to be consistent with
the name of test_pathkit.py and make for easier grepping.
- Increases the JS test timeout to 10s (up from 5) to hopefully avoid
the flakes seen in the Debug Test.
Bug: skia:8216
Change-Id: Ic2cad54f3d19cc16601cf2e9a87798db1e6887a2
Reviewed-on: https://skia-review.googlesource.com/147042
Reviewed-by: Stephan Altmueller <stephana@google.com>
2018-08-15 17:45:28 +00:00
|
|
|
yield (
|
|
|
|
|
api.test('pathkit_trybot') +
|
|
|
|
|
api.properties(buildername=('Test-Debian9-EMCC-GCE-CPU-AVX2'
|
|
|
|
|
'-wasm-Debug-All-PathKit'),
|
|
|
|
|
repository='https://skia.googlesource.com/skia.git',
|
|
|
|
|
revision='abc123',
|
|
|
|
|
path_config='kitchen',
|
|
|
|
|
swarm_out_dir='[SWARM_OUT_DIR]',
|
2018-09-12 18:39:34 +00:00
|
|
|
patch_ref='89/456789/12',
|
|
|
|
|
patch_repo='https://skia.googlesource.com/skia.git',
|
[PathKit] Adding test infrastructure to support Gold output
To get the gold images out of the browser tests, this adds
testReporter.js and pathkit_aggregator.go. testReporter bundles
up the output as a base64 encoded PNG and sends it over the local
network to pathkit_aggregator. pathkit_aggregator will keep
a list of test results reported in this way and write the PNGs
to /OUT of the container (which is the swarming output directory).
Finally, after all the tests are run, the helper script "test_pathkit.sh"
makes a POST request that creates the JSON file that gold expects
(following the schema https://github.com/google/skia-buildbot/blob/master/golden/docs/INGESTION.md)
pathkit_aggregator takes many command line arguments which control
the keys that Gold needs in order to ingest and handle the data.
Of note, this creates a new set (i.e. source_type) of gold images
called "pathkit", which will distinguish it from "gm", "image", etc.
There will be at least 2 sub-sets of "pathkit" images, "canvas" and "svg",
(representing the 2 output types of PathKit). This CL doesn't
quite handle SVG yet, as it needs a way to convert SVG to PNG in the
browser and will be addressed in a follow up CL.
A "standard" gm is sized at 600x600. This was arbitrarily picked.
Note that the functions in testReporter.js return Promises based
on the fetch requests to post the data. This eliminates the race
condition between the /report_gold_data and /dump_json since
running the karma tests won't return until all reports are done.
Other changes of note:
- Adds go to karma-chrome-tests container.
- renames recipe_modules/build/wasm.py -> pathkit.py to be consistent with
the name of test_pathkit.py and make for easier grepping.
- Increases the JS test timeout to 10s (up from 5) to hopefully avoid
the flakes seen in the Debug Test.
Bug: skia:8216
Change-Id: Ic2cad54f3d19cc16601cf2e9a87798db1e6887a2
Reviewed-on: https://skia-review.googlesource.com/147042
Reviewed-by: Stephan Altmueller <stephana@google.com>
2018-08-15 17:45:28 +00:00
|
|
|
patch_storage='gerrit',
|
|
|
|
|
patch_set=7,
|
|
|
|
|
patch_issue=1234,
|
|
|
|
|
gerrit_project='skia',
|
|
|
|
|
gerrit_url='https://skia-review.googlesource.com/')
|
|
|
|
|
)
|
