iOS: try running the binary

Change-Id: I723631d1744b128350546d480201da5d4159af65
Reviewed-on: https://skia-review.googlesource.com/7983
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>

3 files changed, 16 insertions, 8 deletions

diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py
index 84286f4e81..57ff01b56d 100644
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -138,10 +138,12 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
     os           = self.m.vars.builder_cfg.get('os',           '')
 
     if 'iOS' == os:
-      self._py('package ' + str(app),
+      self._py('package ' + name,
                self.m.vars.skia_dir.join('gn', 'package_ios.py'),
                args=[str(app)])
-      self._run('deploy', ['ios-deploy', '-b', str(app) + '.app'])
+      self._run(name,
+                ['ios-deploy', '-b', str(app) + '.app',
+                 '-I', '--args', '"%s"' % ' '.join(map(str, cmd[1:]))])
       return
 
     if 'SAN' in extra_config:
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
index e24b495135..44e75863fc 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
@@ -111,16 +111,19 @@
       "[START_DIR]/out/Release/nanobench"
     ],
     "cwd": "[START_DIR]/skia",
-    "name": "package [START_DIR]/out/Release/nanobench"
+    "name": "package nanobench"
   },
   {
     "cmd": [
       "ios-deploy",
       "-b",
-      "[START_DIR]/out/Release/nanobench.app"
+      "[START_DIR]/out/Release/nanobench.app",
+      "-I",
+      "--args",
+      "\"--undefok -i [START_DIR]/skia/resources --skps [START_DIR]/skp --images [START_DIR]/skimage/nanobench --svgs [START_DIR]/svg --nocpu --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --skps ignore_skps --config 8888 gpu nonrendering hwui f16 srgb msaa16 nvpr16 nvprdit16 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi ~path_hairline ~GLInstancedArraysBench ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS\""
     ],
     "cwd": "[START_DIR]/skia",
-    "name": "deploy"
+    "name": "nanobench"
   },
   {
     "cmd": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
index 0bc0a26f2c..57ec96d021 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
@@ -181,16 +181,19 @@
       "[START_DIR]/out/Release/dm"
     ],
     "cwd": "[START_DIR]/skia",
-    "name": "package [START_DIR]/out/Release/dm"
+    "name": "package dm"
   },
   {
     "cmd": [
       "ios-deploy",
       "-b",
-      "[START_DIR]/out/Release/dm.app"
+      "[START_DIR]/out/Release/dm.app",
+      "-I",
+      "--args",
+      "\"--undefok --resourcePath [START_DIR]/skia/resources --skps [START_DIR]/skp --images [START_DIR]/skimage/dm --colorImages [START_DIR]/skimage/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release build_number 5 --svgs [START_DIR]/svg --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS --uninterestingHashesFile [START_DIR]/tmp/uninteresting_hashes.txt --writePath [CUSTOM_[SWARM_OUT_DIR]]/dm --nocpu --config 8888 srgb gpu gpudft gpusrgb pdf msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ 8888 image _ _ gpu skp _ _ _ 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 _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ 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\""
     ],
     "cwd": "[START_DIR]/skia",
-    "name": "deploy"
+    "name": "dm"
   },
   {
     "name": "$result",