Enable Metal MSAA configs and ignore flaky test
Bug: skia:8243, skia:9255
Change-Id: I006d1bace2bec5ea24b0e2be560a8ff26127f503
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/227402
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
diff --git a/infra/bots/recipes/test.expected/Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal.json b/infra/bots/recipes/test.expected/Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal.json
index 1516f56..9249c3e 100644
--- a/infra/bots/recipes/test.expected/Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal.json
+++ b/infra/bots/recipes/test.expected/Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal.json
@@ -268,6 +268,7 @@
"--nocpu",
"--config",
"mtl",
+ "mtlmsaa8",
"--src",
"tests",
"gm",
@@ -499,6 +500,8 @@
"image",
"_",
".SRW",
+ "--match",
+ "~WritePixelsNonTextureMSAA_Gpu",
"--nonativeFonts",
"--verbose"
],
diff --git a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal.json b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal.json
new file mode 100644
index 0000000..b8f3da6
--- /dev/null
+++ b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal.json
@@ -0,0 +1,928 @@
+[
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[START_DIR]/tmp"
+ ],
+ "infra_step": true,
+ "name": "makedirs tmp_dir"
+ },
+ {
+ "cmd": [
+ "ios.py"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "setup_device"
+ },
+ {
+ "cmd": [
+ "ideviceinstaller",
+ "-i",
+ "[START_DIR]/build/dm.app"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "install_dm"
+ },
+ {
+ "cmd": [
+ "ideviceinstaller",
+ "-i",
+ "[START_DIR]/build/nanobench.app"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "install_nanobench"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
+ "[START_DIR]/skia/resources",
+ "resources"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push_if_needed [START_DIR]/skia/resources"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[START_DIR]/skia/infra/bots/assets/skp/VERSION",
+ "/path/to/tmp/"
+ ],
+ "env": {
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
+ },
+ "infra_step": true,
+ "name": "Get skp VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "42",
+ "[START_DIR]/tmp/SKP_VERSION"
+ ],
+ "env": {
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
+ },
+ "infra_step": true,
+ "name": "write SKP_VERSION",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@SKP_VERSION@42@@@",
+ "@@@STEP_LOG_END@SKP_VERSION@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
+ "tmp/SKP_VERSION"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "cat_file tmp/SKP_VERSION"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
+ "tmp/SKP_VERSION"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "rm tmp/SKP_VERSION"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
+ "skps"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "rm skps"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
+ "skps"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "mkdir skps"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
+ "[START_DIR]/skp",
+ "skps"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push_if_needed [START_DIR]/skp"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
+ "[START_DIR]/tmp/SKP_VERSION",
+ "tmp/SKP_VERSION"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push_file [START_DIR]/tmp/SKP_VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[START_DIR]/skia/infra/bots/assets/skimage/VERSION",
+ "/path/to/tmp/"
+ ],
+ "env": {
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
+ },
+ "infra_step": true,
+ "name": "Get skimage VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "42",
+ "[START_DIR]/tmp/SK_IMAGE_VERSION"
+ ],
+ "env": {
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
+ },
+ "infra_step": true,
+ "name": "write SK_IMAGE_VERSION",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@SK_IMAGE_VERSION@42@@@",
+ "@@@STEP_LOG_END@SK_IMAGE_VERSION@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
+ "tmp/SK_IMAGE_VERSION"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "cat_file tmp/SK_IMAGE_VERSION"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
+ "tmp/SK_IMAGE_VERSION"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "rm tmp/SK_IMAGE_VERSION"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
+ "images"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "rm images"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
+ "images"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "mkdir images"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
+ "[START_DIR]/skimage",
+ "images"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push_if_needed [START_DIR]/skimage"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
+ "[START_DIR]/tmp/SK_IMAGE_VERSION",
+ "tmp/SK_IMAGE_VERSION"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[START_DIR]/skia/infra/bots/assets/svg/VERSION",
+ "/path/to/tmp/"
+ ],
+ "env": {
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
+ },
+ "infra_step": true,
+ "name": "Get svg VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "42",
+ "[START_DIR]/tmp/SVG_VERSION"
+ ],
+ "env": {
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
+ },
+ "infra_step": true,
+ "name": "write SVG_VERSION",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@SVG_VERSION@42@@@",
+ "@@@STEP_LOG_END@SVG_VERSION@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
+ "tmp/SVG_VERSION"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "cat_file tmp/SVG_VERSION"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
+ "tmp/SVG_VERSION"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "rm tmp/SVG_VERSION"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
+ "svgs"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "rm svgs"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
+ "svgs"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "mkdir svgs"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
+ "[START_DIR]/svg",
+ "svgs"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push_if_needed [START_DIR]/svg"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
+ "[START_DIR]/tmp/SVG_VERSION",
+ "tmp/SVG_VERSION"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push_file [START_DIR]/tmp/SVG_VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "[START_DIR]/test"
+ ],
+ "env": {
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
+ },
+ "infra_step": true,
+ "name": "rmtree test"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[START_DIR]/test"
+ ],
+ "env": {
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
+ },
+ "infra_step": true,
+ "name": "makedirs test"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
+ "dm"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "rm dm"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
+ "dm"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "mkdir dm"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = sys.argv[1]\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[2], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
+ "https://example.com/hashes.txt",
+ "[START_DIR]/tmp/uninteresting_hashes.txt"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "get uninteresting hashes",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import contextlib@@@",
+ "@@@STEP_LOG_LINE@python.inline@import math@@@",
+ "@@@STEP_LOG_LINE@python.inline@import socket@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@import time@@@",
+ "@@@STEP_LOG_LINE@python.inline@import urllib2@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@HASHES_URL = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@",
+ "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@",
+ "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@",
+ "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ try:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ with contextlib.closing(@@@",
+ "@@@STEP_LOG_LINE@python.inline@ urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ hashes = w.read()@@@",
+ "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ f.write(hashes)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ break@@@",
+ "@@@STEP_LOG_LINE@python.inline@ except Exception as e:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print 'Failed to get uninteresting hashes from %s:' % HASHES_URL@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print e@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if retry == RETRIES:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ raise@@@",
+ "@@@STEP_LOG_LINE@python.inline@ waittime = WAIT_BASE * math.pow(2, retry)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print 'Retry in %d seconds.' % waittime@@@",
+ "@@@STEP_LOG_LINE@python.inline@ time.sleep(waittime)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
+ "[START_DIR]/tmp/uninteresting_hashes.txt",
+ "tmp/uninteresting_hashes.txt"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "push_file [START_DIR]/tmp/uninteresting_hashes.txt"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n"
+ ],
+ "env": {
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
+ },
+ "name": "get swarming bot id",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@import os@@@",
+ "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n"
+ ],
+ "env": {
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
+ },
+ "name": "get swarming task id",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@import os@@@",
+ "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "idevice-app-runner",
+ "-s",
+ "com.google.dm",
+ "--args",
+ "--resourcePath",
+ "resources",
+ "--skps",
+ "skps",
+ "--images",
+ "images/dm",
+ "--colorImages",
+ "images/colorspace",
+ "--nameByHash",
+ "--properties",
+ "gitHash",
+ "abc123",
+ "builder",
+ "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal",
+ "buildbucket_build_id",
+ "123454321",
+ "task_id",
+ "task_12345",
+ "swarming_bot_id",
+ "skia-bot-123",
+ "swarming_task_id",
+ "123456",
+ "--svgs",
+ "svgs",
+ "--key",
+ "arch",
+ "arm64",
+ "compiler",
+ "Clang",
+ "configuration",
+ "Release",
+ "cpu_or_gpu",
+ "GPU",
+ "cpu_or_gpu_value",
+ "PowerVRGX6450",
+ "extra_config",
+ "Metal",
+ "model",
+ "iPhone6",
+ "os",
+ "iOS",
+ "style",
+ "default",
+ "--uninterestingHashesFile",
+ "tmp/uninteresting_hashes.txt",
+ "--writePath",
+ "dm",
+ "--dont_write",
+ "pdf",
+ "--randomProcessorTest",
+ "--nocpu",
+ "--config",
+ "mtl",
+ "mtlmsaa4",
+ "--src",
+ "tests",
+ "gm",
+ "image",
+ "colorImage",
+ "svg",
+ "--blacklist",
+ "_",
+ "svg",
+ "_",
+ "svgparse_",
+ "_",
+ "image",
+ "gen_platf",
+ "rgba32abf.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "rgb24prof.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "rgb24lprof.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "8bpp-pixeldata-cropped.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "4bpp-pixeldata-cropped.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "32bpp-pixeldata-cropped.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "24bpp-pixeldata-cropped.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "frame_larger_than_image.gif",
+ "_",
+ "image",
+ "gen_platf",
+ "inc0.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc1.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc2.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc3.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc4.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc5.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc6.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc7.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc8.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc9.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc10.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc11.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc12.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc13.png",
+ "_",
+ "image",
+ "gen_platf",
+ "inc14.png",
+ "_",
+ "image",
+ "gen_platf",
+ "incInterlaced.png",
+ "_",
+ "image",
+ "gen_platf",
+ "incInterlaced.gif",
+ "_",
+ "image",
+ "gen_platf",
+ "inc1.gif",
+ "_",
+ "image",
+ "gen_platf",
+ "inc0.gif",
+ "_",
+ "image",
+ "gen_platf",
+ "butterfly.gif",
+ "_",
+ "image",
+ "gen_platf",
+ "error",
+ "_",
+ "test",
+ "_",
+ "GrShape",
+ "_",
+ "image",
+ "_",
+ "interlaced1.png",
+ "_",
+ "image",
+ "_",
+ "interlaced2.png",
+ "_",
+ "image",
+ "_",
+ "interlaced3.png",
+ "_",
+ "image",
+ "_",
+ ".arw",
+ "_",
+ "image",
+ "_",
+ ".cr2",
+ "_",
+ "image",
+ "_",
+ ".dng",
+ "_",
+ "image",
+ "_",
+ ".nef",
+ "_",
+ "image",
+ "_",
+ ".nrw",
+ "_",
+ "image",
+ "_",
+ ".orf",
+ "_",
+ "image",
+ "_",
+ ".raf",
+ "_",
+ "image",
+ "_",
+ ".rw2",
+ "_",
+ "image",
+ "_",
+ ".pef",
+ "_",
+ "image",
+ "_",
+ ".srw",
+ "_",
+ "image",
+ "_",
+ ".ARW",
+ "_",
+ "image",
+ "_",
+ ".CR2",
+ "_",
+ "image",
+ "_",
+ ".DNG",
+ "_",
+ "image",
+ "_",
+ ".NEF",
+ "_",
+ "image",
+ "_",
+ ".NRW",
+ "_",
+ "image",
+ "_",
+ ".ORF",
+ "_",
+ "image",
+ "_",
+ ".RAF",
+ "_",
+ "image",
+ "_",
+ ".RW2",
+ "_",
+ "image",
+ "_",
+ ".PEF",
+ "_",
+ "image",
+ "_",
+ ".SRW",
+ "--nonativeFonts",
+ "--verbose"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "name": "dm"
+ },
+ {
+ "cmd": [
+ "[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed",
+ "dm",
+ "[START_DIR]/[SWARM_OUT_DIR]"
+ ],
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "IOS_BUNDLE_ID": "com.google.dm",
+ "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+ "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ },
+ "infra_step": true,
+ "name": "pull_if_needed dm"
+ },
+ {
+ "name": "$result"
+ }
+]
\ No newline at end of file
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index b4f2e3d..8c1c574 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -255,6 +255,10 @@
if 'Metal' in bot:
configs = ['mtl']
+ if 'iOS' in bot:
+ configs.append('mtlmsaa4')
+ else:
+ configs.append('mtlmsaa8')
# Test 1010102 on our Linux/NVIDIA bots and the persistent cache config
# on the GL bots.
@@ -727,6 +731,10 @@
# skbug.com/8047
match.append('~FloatingPointTextureTest$')
+ if 'Metal' in bot and 'HD8870M' in bot and 'Mac' in bot:
+ # skia:9255
+ match.append('~WritePixelsNonTextureMSAA_Gpu')
+
if 'MoltenVK' in bot:
# skbug.com/7959
blacklist(['_', 'gm', '_', 'vertices_scaled_shader'])
@@ -1026,6 +1034,7 @@
'Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader',
'Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan',
'Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan',
+ 'Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal',
('Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All'
'-NativeFonts'),
'Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All',
