AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename GalaxyS7 to include model number.

Browse Source 
We'll be adding GalaxyS7_G930FD soon.

NOTRY=true
BUG=skia:6359

Change-Id: I3235576957ea0c395c8d42ee09d5ee89946176d9
Reviewed-on: https://skia-review.googlesource.com/9091
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
This commit is contained in:
Ben Wagner 2017-03-10 12:45:18 -05:00 committed by Skia Commit-Bot
parent c337c9e020
commit dc175eaab6
5 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
infra/bots/android_map.json
View File

@ -1,19 +1,19 @@
{
"AndroidOne": ["sprout", "MOB30Q"],
"GalaxyS6": ["zerofltetmo", "MMB29K"],
"GalaxyS7": ["heroqlteatt", "MMB29M"],
"GalaxyJ5": ["j5xnlte", "MMB29M"],
"GalaxyTab3": ["goyawifi", "JDQ39"],
"MotoG4": ["athene", "MPJ24.139-64"],
"NVIDIA_Shield": ["foster", "MRA58K"],
"Nexus10": ["manta", "LMY49J"],
"Nexus5": ["hammerhead", "M4B30Z"],
"Nexus6": ["shamu", "M"],
"Nexus6p": ["angler", "NMF26C"],
"Nexus7": ["grouper", "LMY47V"],
"Nexus7v2": ["flo", "M"],
"NexusPlayer": ["fugu", "N2G10B"],
"Pixel": ["sailfish", "NMF26Q"],
"PixelC": ["dragon", "NMF26H"],
"PixelXL": ["marlin", "NMF26Q"]
"AndroidOne": ["sprout", "MOB30Q"],
"GalaxyS6": ["zerofltetmo", "MMB29K"],
"GalaxyS7_G930A": ["heroqlteatt", "MMB29M"],
"GalaxyJ5": ["j5xnlte", "MMB29M"],
"GalaxyTab3": ["goyawifi", "JDQ39"],
"MotoG4": ["athene", "MPJ24.139-64"],
"NVIDIA_Shield": ["foster", "MRA58K"],
"Nexus10": ["manta", "LMY49J"],
"Nexus5": ["hammerhead", "M4B30Z"],
"Nexus6": ["shamu", "M"],
"Nexus6p": ["angler", "NMF26C"],
"Nexus7": ["grouper", "LMY47V"],
"Nexus7v2": ["flo", "M"],
"NexusPlayer": ["fugu", "N2G10B"],
"Pixel": ["sailfish", "NMF26Q"],
"PixelC": ["dragon", "NMF26H"],
"PixelXL": ["marlin", "NMF26Q"]
}

8
infra/bots/jobs.json
View File

@ -77,8 +77,8 @@
"Perf-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android",
"Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android",
"Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android",
"Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
"Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
"Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android",
"Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android",
"Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android",
"Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android",
"Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
@ -182,8 +182,8 @@
"Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android",
"Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android",
"Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android",
"Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
"Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
"Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android",
"Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android",
"Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android",
"Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android",
"Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android",

2
infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android.json → infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json
View File

@ -495,7 +495,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno530 extra_config GN_Android model GalaxyS7 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ 8888 image _ _ _ 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 serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image 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; echo $? >/data/local/tmp/rc",
"set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno530 extra_config Android model GalaxyS7_G930A os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 srgb gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ 8888 image _ _ _ 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 serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image 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; echo $? >/data/local/tmp/rc",
"[START_DIR]/tmp/dm.sh"
],
"name": "write dm.sh"

2
infra/bots/recipe_modules/sktest/example.py
View File

@ -22,7 +22,7 @@ TEST_BUILDERS = {
'Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android',
'Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android',
'Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android',
'Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android',
'Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android',
'Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android',
'Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android',
'Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android',

50
infra/bots/tasks.json
View File

@ -470,16 +470,16 @@
"Upload-Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android"
]
},
"Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
"Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android": {
"priority": 0.8,
"tasks": [
"Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android"
"Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android"
]
},
"Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
"Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android": {
"priority": 0.8,
"tasks": [
"Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
"Upload-Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android"
]
},
"Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": {
@ -1100,16 +1100,16 @@
"Upload-Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android"
]
},
"Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
"Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android": {
"priority": 0.8,
"tasks": [
"Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android"
"Upload-Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android"
]
},
"Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
"Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android": {
"priority": 0.8,
"tasks": [
"Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
"Upload-Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android"
]
},
"Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android": {
@ -4212,7 +4212,7 @@
"max_attempts": 1,
"priority": 0.8
},
"Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
"Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@ -4246,7 +4246,7 @@
"../../..",
"swarm_perf",
"repository=<(REPO)",
"buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
"buildername=Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@ -4262,7 +4262,7 @@
"max_attempts": 1,
"priority": 0.8
},
"Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
"Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@ -4296,7 +4296,7 @@
"../../..",
"swarm_perf",
"repository=<(REPO)",
"buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
"buildername=Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@ -9423,7 +9423,7 @@
"max_attempts": 1,
"priority": 0.8
},
"Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
"Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@ -9457,7 +9457,7 @@
"../../..",
"swarm_test",
"repository=<(REPO)",
"buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
"buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@ -9473,7 +9473,7 @@
"max_attempts": 1,
"priority": 0.8
},
"Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
"Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@ -9507,7 +9507,7 @@
"../../..",
"swarm_test",
"repository=<(REPO)",
"buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
"buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@ -14828,9 +14828,9 @@
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
"Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
"Upload-Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android": {
"dependencies": [
"Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
"Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android"
],
"dimensions": [
"cpu:x86-64-avx2",
@ -14843,7 +14843,7 @@
"../../..",
"upload_nano_results",
"repository=<(REPO)",
"buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
"buildername=Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@ -16358,9 +16358,9 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
"Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
"Upload-Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android": {
"dependencies": [
"Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android"
"Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android"
],
"dimensions": [
"cpu:x86-64-avx2",
@ -16373,7 +16373,7 @@
"../../..",
"upload_dm_results",
"repository=<(REPO)",
"buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
"buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@ -16388,9 +16388,9 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
"Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
"Upload-Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android": {
"dependencies": [
"Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
"Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android"
],
"dimensions": [
"cpu:x86-64-avx2",
@ -16403,7 +16403,7 @@
"../../..",
"upload_dm_results",
"repository=<(REPO)",
"buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
"buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",