diff options
4 files changed, 508 insertions, 19 deletions
diff --git a/infra/bots/recipe_modules/flavor/ios_flavor.py b/infra/bots/recipe_modules/flavor/ios_flavor.py index abadc15e42..2d141c1552 100644 --- a/infra/bots/recipe_modules/flavor/ios_flavor.py +++ b/infra/bots/recipe_modules/flavor/ios_flavor.py @@ -2,6 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# Disable warning about setting self.device_dirs in install(); we need to. +# pylint: disable=W0201 + +import default_flavor import gn_flavor # Infra step failures interact really annoyingly with swarming retries. @@ -9,6 +13,16 @@ kInfraStep = False class iOSFlavorUtils(gn_flavor.GNFlavorUtils): + def install(self): + self.device_dirs = default_flavor.DeviceDirs( + dm_dir='dm', + perf_data_dir='perf', + resource_dir='resources', + images_dir='images', + skp_dir='skps', + svg_dir='svgs', + tmp_dir='tmp') + def step(self, name, cmd, env=None, **kwargs): app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0]) 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 92271ee23b..772cbfb291 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 @@ -3,7 +3,7 @@ "cmd": [ "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", "[START_DIR]/skia/resources", - "[START_DIR]/skia/resources" + "resources" ], "env": { "BUILDTYPE": "Release", @@ -34,6 +34,81 @@ }, { "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", + "tmp/SKP_VERSION" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "cat_file tmp/SKP_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", + "tmp/SKP_VERSION" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "rm tmp/SKP_VERSION" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", + "skps" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "rm skps" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", + "skps" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "mkdir skps" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skp", + "skps" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "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": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "push_file [START_DIR]/tmp/SKP_VERSION" + }, + { + "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", @@ -54,6 +129,81 @@ }, { "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", + "tmp/SK_IMAGE_VERSION" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "cat_file tmp/SK_IMAGE_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", + "tmp/SK_IMAGE_VERSION" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "rm tmp/SK_IMAGE_VERSION" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", + "images" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "rm images" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", + "images" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "mkdir images" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skimage", + "images" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "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": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" + }, + { + "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", @@ -74,27 +224,102 @@ }, { "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", + "tmp/SVG_VERSION" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "cat_file tmp/SVG_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data" + "tmp/SVG_VERSION" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "rm tmp/SVG_VERSION" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", + "svgs" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "SKIA_OUT": "[START_DIR]/out" }, - "name": "rm [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data" + "name": "rm svgs" }, { "cmd": [ "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data" + "svgs" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "mkdir svgs" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/svg", + "svgs" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "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": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "push_file [START_DIR]/tmp/SVG_VERSION" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", + "perf" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "SKIA_OUT": "[START_DIR]/out" }, - "name": "mkdir [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data" + "name": "rm perf" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", + "perf" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "mkdir perf" }, { "cmd": [ @@ -113,7 +338,7 @@ "[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" + "--undefok -i resources --skps skps --images images/nanobench --svgs svgs --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 perf/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": "nanobench" @@ -143,10 +368,10 @@ { "cmd": [ "[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed", - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data", + "perf", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data" ], - "name": "pull_if_needed [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data" + "name": "pull_if_needed perf" }, { "name": "$result", 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 c157b7d620..f9fc56e059 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 @@ -3,7 +3,7 @@ "cmd": [ "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", "[START_DIR]/skia/resources", - "[START_DIR]/skia/resources" + "resources" ], "env": { "BUILDTYPE": "Release", @@ -34,6 +34,81 @@ }, { "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", + "tmp/SKP_VERSION" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "cat_file tmp/SKP_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", + "tmp/SKP_VERSION" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "rm tmp/SKP_VERSION" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", + "skps" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "rm skps" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", + "skps" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "mkdir skps" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skp", + "skps" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "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": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "push_file [START_DIR]/tmp/SKP_VERSION" + }, + { + "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", @@ -54,6 +129,81 @@ }, { "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", + "tmp/SK_IMAGE_VERSION" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "cat_file tmp/SK_IMAGE_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", + "tmp/SK_IMAGE_VERSION" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "rm tmp/SK_IMAGE_VERSION" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", + "images" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "rm images" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", + "images" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "mkdir images" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skimage", + "images" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "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": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" + }, + { + "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", @@ -74,6 +224,81 @@ }, { "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", + "tmp/SVG_VERSION" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "cat_file tmp/SVG_VERSION", + "stdout": "/path/to/tmp/" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", + "tmp/SVG_VERSION" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "rm tmp/SVG_VERSION" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", + "svgs" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "rm svgs" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", + "svgs" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "mkdir svgs" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/svg", + "svgs" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "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": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "push_file [START_DIR]/tmp/SVG_VERSION" + }, + { + "cmd": [ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", @@ -118,6 +343,30 @@ }, { "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", + "dm" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "rm dm" + }, + { + "cmd": [ + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", + "dm" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "mkdir dm" + }, + { + "cmd": [ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", @@ -190,7 +439,7 @@ "cmd": [ "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", "[START_DIR]/tmp/uninteresting_hashes.txt", - "[START_DIR]/tmp/uninteresting_hashes.txt" + "tmp/uninteresting_hashes.txt" ], "env": { "BUILDTYPE": "Release", @@ -216,7 +465,7 @@ "[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" + "--undefok --resourcePath resources --skps skps --images images/dm --colorImages images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release build_number 5 --svgs svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS --uninterestingHashesFile tmp/uninteresting_hashes.txt --writePath 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": "dm" @@ -224,10 +473,10 @@ { "cmd": [ "[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "dm", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "name": "pull_if_needed [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull_if_needed dm" }, { "name": "$result", diff --git a/platform_tools/ios/bin/ios_setup.sh b/platform_tools/ios/bin/ios_setup.sh index 0a56d9152b..1acc03b7c1 100755 --- a/platform_tools/ios/bin/ios_setup.sh +++ b/platform_tools/ios/bin/ios_setup.sh @@ -27,7 +27,7 @@ PROVISIONING_PROFILE="" # Code Signing identity - this needs to be set up on the local machine. CODE_SIGN_IDENTITY="iPhone Developer" -IOS_BUNDLE_ID="com.google.iOSShell" +IOS_BUNDLE_ID="com.google.dm" IOS_RESULTS_DIR="results" @@ -36,10 +36,10 @@ if [[ -z "$BUILDTYPE" ]]; then BUILDTYPE="Debug" fi -# Out dir is $SKIA_SRC_DIR/out by default. -if [[ -z "$SKIA_OUT" ]]; then +# Out dir is $SKIA_SRC_DIR/out by default. +if [[ -z "$SKIA_OUT" ]]; then SKIA_OUT="$SKIA_SRC_DIR/out" -fi +fi # Location of XCode build products. if [[ -z "$XCODEBUILD" ]]; then @@ -101,7 +101,7 @@ ios_mount() { # If this is already mounted we unmount it. if $(mount | grep --quiet "$IOS_MOUNT_POINT"); then >&2 echo "Device already mounted at: $IOS_MOUNT_POINT - Unmounting." - ios_umount || true + ios_umount || true fi # Ensure there is a mount directory. @@ -111,6 +111,7 @@ ios_mount() { ifuse --container $IOS_BUNDLE_ID $IOS_MOUNT_POINT sleep 1 >&2 echo "Successfully mounted device." + #find $IOS_MOUNT_POINT } # ios_umount: unmounts the ios device. @@ -121,7 +122,7 @@ ios_umount() { # ios_restart: restarts the iOS device. ios_restart() { - ios_umount || true + ios_umount || true idevicediagnostics restart } |