Index: master/master_builders_cfg.py |
=================================================================== |
--- master/master_builders_cfg.py (revision 8794) |
+++ master/master_builders_cfg.py (working copy) |
@@ -6,7 +6,8 @@ |
from skia_master_scripts import factory as skia_factory |
from skia_master_scripts import utils |
-from skia_master_scripts.utils import MakeBuilderSet, \ |
+from skia_master_scripts.utils import BuilderProperties, \ |
+ MakeBuilderSet, \ |
MakeAndroidBuilderSet, \ |
MakeChromeOSBuilderSet, \ |
MakeIOSBuilderSet, \ |
@@ -55,20 +56,32 @@ |
defaults['category'] = 'Linux' |
MakeBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Shuttle_Ubuntu12_ATI5770_Float_%s_64', |
+ builder_props=BuilderProperties( |
+ os='Ubuntu', |
+ version='12', |
+ arch_width='32', |
+ model='ShuttleA', |
+ gpu='ATI5770', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_LINUX, |
environment_variables= |
- {'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_arch_width=64'}, |
+ {'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_arch_width=32'}, |
gm_image_subdir='base-shuttle_ubuntu12_ati5770', |
perf_output_basedir=perf_output_basedir_linux) |
MakeBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Shuttle_Ubuntu12_ATI5770_Float_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Ubuntu', |
+ version='12', |
+ arch_width='64', |
+ model='ShuttleA', |
+ gpu='ATI5770', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_LINUX, |
environment_variables= |
- {'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_arch_width=32'}, |
+ {'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_arch_width=64'}, |
gm_image_subdir='base-shuttle_ubuntu12_ati5770', |
perf_output_basedir=perf_output_basedir_linux) |
@@ -76,7 +89,13 @@ |
defaults['category'] = 'Android' |
MakeAndroidBuilderSet( |
helper=helper, |
- builder_base_name='Skia_NexusS_4-1_Float_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Android', |
+ version=None, |
+ arch_width='32', |
+ model='NexusS', |
+ gpu='SGX540', |
+ ), |
device='nexus_s', |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_LINUX, |
@@ -85,7 +104,13 @@ |
perf_output_basedir=perf_output_basedir_linux) |
MakeAndroidBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Xoom_4-1_Float_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Android', |
+ version=None, |
+ arch_width='32', |
+ model='Xoom', |
+ gpu='Tegra2', |
+ ), |
device='xoom', |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_LINUX, |
@@ -94,7 +119,13 @@ |
perf_output_basedir=perf_output_basedir_linux) |
MakeAndroidBuilderSet( |
helper=helper, |
- builder_base_name='Skia_GalaxyNexus_4-1_Float_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Android', |
+ version=None, |
+ arch_width='32', |
+ model='GalaxyNexus', |
+ gpu='SGX540', |
+ ), |
device='galaxy_nexus', |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_LINUX, |
@@ -103,7 +134,13 @@ |
perf_output_basedir=perf_output_basedir_linux) |
MakeAndroidBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Nexus4_4-1_Float_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Android', |
+ version=None, |
+ arch_width='32', |
+ model='Nexus4', |
+ gpu='Adreno320', |
+ ), |
device='nexus_4', |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_LINUX, |
@@ -112,7 +149,13 @@ |
perf_output_basedir=perf_output_basedir_linux) |
MakeAndroidBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Nexus7_4-1_Float_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Android', |
+ version=None, |
+ arch_width='32', |
+ model='Nexus7', |
+ gpu='Tegra3', |
+ ), |
device='nexus_7', |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_LINUX, |
@@ -121,7 +164,13 @@ |
perf_output_basedir=perf_output_basedir_linux) |
MakeAndroidBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Nexus10_4-1_Float_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Android', |
+ version=None, |
+ arch_width='32', |
+ model='Nexus10', |
+ gpu='MaliT604', |
+ ), |
device='nexus_10', |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_LINUX, |
@@ -130,7 +179,13 @@ |
perf_output_basedir=perf_output_basedir_linux) |
MakeAndroidBuilderSet( |
helper=helper, |
- builder_base_name='Skia_RazrI_4-1_Float_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Android', |
+ version=None, |
+ arch_width='32', |
+ model='RazrI', |
+ gpu='SGX540', |
+ ), |
device='x86', |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_LINUX, |
@@ -142,7 +197,13 @@ |
defaults['category'] = 'Mac-10.6' |
MakeBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Mac_Float_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Mac', |
+ version='10.6', |
+ arch_width='32', |
+ model='MacMini4,1', |
+ gpu='GeForce320M', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_MAC, |
environment_variables= |
@@ -152,7 +213,13 @@ |
perf_output_basedir=perf_output_basedir_mac) |
MakeBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Mac_Float_%s_64', |
+ builder_props=BuilderProperties( |
+ os='Mac', |
+ version='10.6', |
+ arch_width='64', |
+ model='MacMini4,1', |
+ gpu='GeForce320M', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_MAC, |
environment_variables= |
@@ -166,7 +233,13 @@ |
defaults['category'] = 'Mac-10.7' |
MakeBuilderSet( |
helper=helper, |
- builder_base_name='Skia_MacMiniLion_Float_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Mac', |
+ version='10.7', |
+ arch_width='32', |
+ model='MacMini4,1', |
+ gpu='GeForce320M', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_MAC, |
environment_variables= |
@@ -175,7 +248,13 @@ |
perf_output_basedir=perf_output_basedir_mac) |
MakeBuilderSet( |
helper=helper, |
- builder_base_name='Skia_MacMiniLion_Float_%s_64', |
+ builder_props=BuilderProperties( |
+ os='Mac', |
+ version='10.7', |
+ arch_width='64', |
+ model='MacMini4,1', |
+ gpu='GeForce320M', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_MAC, |
environment_variables= |
@@ -188,7 +267,13 @@ |
defaults['category'] = 'Mac-10.8' |
MakeBuilderSet( |
helper=helper, |
- builder_base_name='Skia_MacMini_10_8_Float_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Mac', |
+ version='10.8', |
+ arch_width='32', |
+ model='MacMini4,1', |
+ gpu='GeForce320M', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_MAC, |
environment_variables= |
@@ -197,7 +282,13 @@ |
perf_output_basedir=perf_output_basedir_mac) |
MakeBuilderSet( |
helper=helper, |
- builder_base_name='Skia_MacMini_10_8_Float_%s_64', |
+ builder_props=BuilderProperties( |
+ os='Mac', |
+ version='10.8', |
+ arch_width='64', |
+ model='MacMini4,1', |
+ gpu='GeForce320M', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_MAC, |
environment_variables= |
@@ -210,7 +301,13 @@ |
defaults['category'] = 'Win7' |
MakeBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Shuttle_Win7_Intel_Float_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Win', |
+ version='7', |
+ arch_width='32', |
+ model='ShuttleA', |
+ gpu='HD2000', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_WIN32, |
environment_variables= |
@@ -220,7 +317,13 @@ |
perf_output_basedir=perf_output_basedir_windows) |
MakeBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Shuttle_Win7_Intel_Float_%s_64', |
+ builder_props=BuilderProperties( |
+ os='Win', |
+ version='7', |
+ arch_width='64', |
+ model='ShuttleA', |
+ gpu='HD2000', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_WIN32, |
environment_variables= |
@@ -234,7 +337,14 @@ |
defaults['category'] = 'Win7-Special' |
MakeBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Shuttle_Win7_Intel_Float_ANGLE_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Win', |
+ version='7', |
+ arch_width='32', |
+ model='ShuttleA', |
+ gpu='HD2000', |
+ extra_config='ANGLE', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_WIN32, |
environment_variables= |
@@ -247,7 +357,14 @@ |
bench_pictures_cfg='angle') |
MakeBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Shuttle_Win7_Intel_Float_DirectWrite_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Win', |
+ version='7', |
+ arch_width='32', |
+ model='ShuttleA', |
+ gpu='HD2000', |
+ extra_config='DirectWrite', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_WIN32, |
environment_variables= |
@@ -260,7 +377,13 @@ |
defaults['category'] = 'iOS' |
MakeIOSBuilderSet( |
helper=helper, |
- builder_base_name='Skia_iOS_%s_32', |
+ builder_props=BuilderProperties( |
+ os='iOS', |
+ version='6', |
+ arch_width='32', |
+ model='iPhone', |
+ gpu='SGX543MP3', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_MAC, |
environment_variables={'GYP_DEFINES': 'skia_os=ios'}, |
@@ -281,7 +404,13 @@ |
defaults['category'] = 'Linux-Special' |
MakeBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Linux_NoGPU_%s_32', |
+ builder_props=BuilderProperties( |
+ os='Ubuntu', |
+ version='12', |
+ arch_width='32', |
+ model='ShuttleA', |
+ gpu='NoGPU', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_LINUX, |
environment_variables= |
@@ -294,7 +423,14 @@ |
MakeNaClBuilderSet( |
helper=helper, |
- builder_base_name='Skia_Shuttle_Ubuntu12_NaCl_%s', |
+ builder_props=BuilderProperties( |
+ os='Ubuntu', |
+ version='12', |
+ arch_width='32_64', |
+ model='ShuttleA', |
+ gpu='ATI5770', |
+ extra_config='NaCl', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_LINUX, |
gm_image_subdir=None, |
@@ -307,7 +443,13 @@ |
defaults['category'] = 'ChromeOS' |
MakeChromeOSBuilderSet( |
helper=helper, |
- builder_base_name='Skia_ChromeOS_Alex_%s_32', |
+ builder_props=BuilderProperties( |
+ os='ChromeOS', |
+ version=None, |
+ arch_width='32', |
+ model='Alex', |
+ gpu='GMA3150', |
+ ), |
do_upload_results=do_upload_results, |
target_platform=skia_factory.TARGET_PLATFORM_LINUX, |
environment_variables= |