| Index: buildbot/master/master_builders_cfg.py
|
| ===================================================================
|
| --- buildbot/master/master_builders_cfg.py (revision 10693)
|
| +++ buildbot/master/master_builders_cfg.py (working copy)
|
| @@ -127,20 +127,20 @@
|
| #
|
| # COMPILE BUILDERS TEST AND PERF BUILDERS
|
| #
|
| - # OS Compiler Config Arch Extra Config GYP_DEFS WERR Role OS Model GPU Extra Config GM Subdir
|
| + # OS Compiler Config Arch Extra Config GYP_DEFS WERR Role OS Model GPU Extra Config
|
| #
|
| f = skia_factory.SkiaFactory
|
| p = skia_factory.TARGET_PLATFORM_LINUX
|
| builder_specs.update({
|
| - ('Ubuntu12', 'GCC', 'Debug', 'x86', None, None, True, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, 'base-shuttle_ubuntu12_ati5770')],
|
| - ('Ubuntu12', 'GCC', 'Release', 'x86', None, None, True, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, 'base-shuttle_ubuntu12_ati5770'),
|
| - ('Perf', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, None)],
|
| - ('Ubuntu12', 'GCC', 'Debug', 'x86_64', None, None, True, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, 'base-shuttle_ubuntu12_ati5770')],
|
| - ('Ubuntu12', 'GCC', 'Release', 'x86_64', None, None, True, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, 'base-shuttle_ubuntu12_ati5770'),
|
| - ('Perf', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, None)],
|
| - ('Ubuntu12', 'GCC', 'Release', 'x86_64', 'Valgrind', valgrind, False, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'HD2000', 'Valgrind', None)],
|
| - ('Ubuntu12', 'Clang', 'Debug', 'x86_64', 'ASAN', None, False, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'HD2000', 'ASAN', None)],
|
| - ('Ubuntu12', 'GCC', 'Debug', 'x86_64', 'NoGPU', no_gpu, True, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'NoGPU', None, 'base-shuttle_ubuntu12_ati5770')],
|
| + ('Ubuntu12', 'GCC', 'Debug', 'x86', None, None, True, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None)],
|
| + ('Ubuntu12', 'GCC', 'Release', 'x86', None, None, True, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None),
|
| + ('Perf', 'Ubuntu12', 'ShuttleA', 'ATI5770', None)],
|
| + ('Ubuntu12', 'GCC', 'Debug', 'x86_64', None, None, True, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None)],
|
| + ('Ubuntu12', 'GCC', 'Release', 'x86_64', None, None, True, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None),
|
| + ('Perf', 'Ubuntu12', 'ShuttleA', 'ATI5770', None)],
|
| + ('Ubuntu12', 'GCC', 'Release', 'x86_64', 'Valgrind', valgrind, False, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'HD2000', 'Valgrind')],
|
| + ('Ubuntu12', 'Clang', 'Debug', 'x86_64', 'ASAN', None, False, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'HD2000', 'ASAN')],
|
| + ('Ubuntu12', 'GCC', 'Debug', 'x86_64', 'NoGPU', no_gpu, True, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'NoGPU', None)],
|
| ('Ubuntu12', 'GCC', 'Release', 'x86_64', 'NoGPU', no_gpu, True, f, p) : [],
|
| ('Ubuntu12', 'Clang', 'Debug', 'x86_64', None, None, True, f, p) : [],})
|
| f = nacl_factory.NaClFactory
|
| @@ -150,38 +150,38 @@
|
| f = skia_factory.SkiaFactory
|
| p = skia_factory.TARGET_PLATFORM_MAC
|
| builder_specs.update({
|
| - ('Mac10.6', 'GCC', 'Debug', 'x86', None, gyp_10_6, True, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, 'base-macmini')],
|
| - ('Mac10.6', 'GCC', 'Release', 'x86', None, gyp_10_6, True, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, 'base-macmini'),
|
| - ('Perf', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, None)],
|
| - ('Mac10.6', 'GCC', 'Debug', 'x86_64', None, gyp_10_6, False, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, 'base-macmini')],
|
| - ('Mac10.6', 'GCC', 'Release', 'x86_64', None, gyp_10_6, False, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, 'base-macmini'),
|
| - ('Perf', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, None)],
|
| - ('Mac10.7', 'Clang', 'Debug', 'x86', None, None, True, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-lion-float')],
|
| - ('Mac10.7', 'Clang', 'Release', 'x86', None, None, True, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-lion-float'),
|
| - ('Perf', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, None)],
|
| - ('Mac10.7', 'Clang', 'Debug', 'x86_64', None, None, False, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-lion-float')],
|
| - ('Mac10.7', 'Clang', 'Release', 'x86_64', None, None, False, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-lion-float'),
|
| - ('Perf', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, None)],
|
| - ('Mac10.8', 'Clang', 'Debug', 'x86', None, None, True, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-10_8')],
|
| - ('Mac10.8', 'Clang', 'Release', 'x86', None, None, True, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-10_8'),
|
| - ('Perf', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, None)],
|
| - ('Mac10.8', 'Clang', 'Debug', 'x86_64', None, None, False, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-10_8')],
|
| - ('Mac10.8', 'Clang', 'Release', 'x86_64', None, None, False, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, 'base-macmini-10_8'),
|
| - ('Perf', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, None)],})
|
| + ('Mac10.6', 'GCC', 'Debug', 'x86', None, gyp_10_6, True, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None)],
|
| + ('Mac10.6', 'GCC', 'Release', 'x86', None, gyp_10_6, True, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None),
|
| + ('Perf', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None)],
|
| + ('Mac10.6', 'GCC', 'Debug', 'x86_64', None, gyp_10_6, False, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None)],
|
| + ('Mac10.6', 'GCC', 'Release', 'x86_64', None, gyp_10_6, False, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None),
|
| + ('Perf', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None)],
|
| + ('Mac10.7', 'Clang', 'Debug', 'x86', None, None, True, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None)],
|
| + ('Mac10.7', 'Clang', 'Release', 'x86', None, None, True, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None),
|
| + ('Perf', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None)],
|
| + ('Mac10.7', 'Clang', 'Debug', 'x86_64', None, None, False, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None)],
|
| + ('Mac10.7', 'Clang', 'Release', 'x86_64', None, None, False, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None),
|
| + ('Perf', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None)],
|
| + ('Mac10.8', 'Clang', 'Debug', 'x86', None, None, True, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None)],
|
| + ('Mac10.8', 'Clang', 'Release', 'x86', None, None, True, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None),
|
| + ('Perf', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None)],
|
| + ('Mac10.8', 'Clang', 'Debug', 'x86_64', None, None, False, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None)],
|
| + ('Mac10.8', 'Clang', 'Release', 'x86_64', None, None, False, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None),
|
| + ('Perf', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None)],})
|
| p = skia_factory.TARGET_PLATFORM_WIN32
|
| builder_specs.update({
|
| - ('Win7', 'VS2010', 'Debug', 'x86', None, gyp_win, True, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None, 'base-shuttle-win7-intel-float')],
|
| - ('Win7', 'VS2010', 'Release', 'x86', None, gyp_win, True, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None, 'base-shuttle-win7-intel-float'),
|
| - ('Perf', 'Win7', 'ShuttleA', 'HD2000', None, None)],
|
| - ('Win7', 'VS2010', 'Debug', 'x86_64', None, gyp_win, False, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None, 'base-shuttle-win7-intel-float')],
|
| - ('Win7', 'VS2010', 'Release', 'x86_64', None, gyp_win, False, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None, 'base-shuttle-win7-intel-float'),
|
| - ('Perf', 'Win7', 'ShuttleA', 'HD2000', None, None)],
|
| - ('Win7', 'VS2010', 'Debug', 'x86', 'ANGLE', gyp_angle, True, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE', 'base-shuttle-win7-intel-angle')],
|
| - ('Win7', 'VS2010', 'Release', 'x86', 'ANGLE', gyp_angle, True, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE', 'base-shuttle-win7-intel-angle'),
|
| - ('Perf', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE', None)],
|
| - ('Win7', 'VS2010', 'Debug', 'x86', 'DirectWrite', gyp_dw, False, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite', 'base-shuttle-win7-intel-directwrite')],
|
| - ('Win7', 'VS2010', 'Release', 'x86', 'DirectWrite', gyp_dw, False, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite', 'base-shuttle-win7-intel-directwrite'),
|
| - ('Perf', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite', None)],
|
| + ('Win7', 'VS2010', 'Debug', 'x86', None, gyp_win, True, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None)],
|
| + ('Win7', 'VS2010', 'Release', 'x86', None, gyp_win, True, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None),
|
| + ('Perf', 'Win7', 'ShuttleA', 'HD2000', None)],
|
| + ('Win7', 'VS2010', 'Debug', 'x86_64', None, gyp_win, False, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None)],
|
| + ('Win7', 'VS2010', 'Release', 'x86_64', None, gyp_win, False, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None),
|
| + ('Perf', 'Win7', 'ShuttleA', 'HD2000', None)],
|
| + ('Win7', 'VS2010', 'Debug', 'x86', 'ANGLE', gyp_angle, True, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE')],
|
| + ('Win7', 'VS2010', 'Release', 'x86', 'ANGLE', gyp_angle, True, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE'),
|
| + ('Perf', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE')],
|
| + ('Win7', 'VS2010', 'Debug', 'x86', 'DirectWrite', gyp_dw, False, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite')],
|
| + ('Win7', 'VS2010', 'Release', 'x86', 'DirectWrite', gyp_dw, False, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite'),
|
| + ('Perf', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite')],
|
| ('Win7', 'VS2010', 'Debug', 'x86', 'Exceptions', gyp_exc, False, f, p) : [],
|
| ('Win8', 'VS2012', 'Debug', 'x86', None, gyp_win, True, f, p) : [],
|
| ('Win8', 'VS2012', 'Release', 'x86', None, gyp_win, True, f, p) : [],
|
| @@ -190,38 +190,38 @@
|
| f = android_factory.AndroidFactory
|
| p = skia_factory.TARGET_PLATFORM_LINUX
|
| builder_specs.update({
|
| - ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'NexusS', None, True, f, p) : [('Test', 'Android', 'NexusS', 'SGX540', None, 'base-android-nexus-s')],
|
| - ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'NexusS', None, True, f, p) : [('Test', 'Android', 'NexusS', 'SGX540', None, 'base-android-nexus-s'),
|
| - ('Perf', 'Android', 'NexusS', 'SGX540', None, None)],
|
| - ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus4', None, True, f, p) : [('Test', 'Android', 'Nexus4', 'Adreno320', None, 'base-android-nexus-4')],
|
| - ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus4', None, True, f, p) : [('Test', 'Android', 'Nexus4', 'Adreno320', None, 'base-android-nexus-4'),
|
| - ('Perf', 'Android', 'Nexus4', 'Adreno320', None, None)],
|
| - ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus7', None, True, f, p) : [('Test', 'Android', 'Nexus7', 'Tegra3', None, 'base-android-nexus-7')],
|
| - ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus7', None, True, f, p) : [('Test', 'Android', 'Nexus7', 'Tegra3', None, 'base-android-nexus-7'),
|
| - ('Perf', 'Android', 'Nexus7', 'Tegra3', None, None)],
|
| - ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus10', None, True, f, p) : [('Test', 'Android', 'Nexus10', 'MaliT604', None, 'base-android-nexus-10')],
|
| - ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus10', None, True, f, p) : [('Test', 'Android', 'Nexus10', 'MaliT604', None, 'base-android-nexus-10'),
|
| - ('Perf', 'Android', 'Nexus10', 'MaliT604', None, None)],
|
| - ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'GalaxyNexus', None, True, f, p) : [('Test', 'Android', 'GalaxyNexus','SGX540', None, 'base-android-galaxy-nexus')],
|
| - ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'GalaxyNexus', None, True, f, p) : [('Test', 'Android', 'GalaxyNexus','SGX540', None, 'base-android-galaxy-nexus'),
|
| - ('Perf', 'Android', 'GalaxyNexus','SGX540', None, None)],
|
| - ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Xoom', None, True, f, p) : [('Test', 'Android', 'Xoom', 'Tegra2', None, 'base-android-xoom')],
|
| - ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Xoom', None, True, f, p) : [('Test', 'Android', 'Xoom', 'Tegra2', None, 'base-android-xoom'),
|
| - ('Perf', 'Android', 'Xoom', 'Tegra2', None, None)],
|
| - ('Ubuntu12', 'GCC', 'Debug', 'x86', 'RazrI', None, True, f, p) : [('Test', 'Android', 'RazrI', 'SGX540', None, 'base-android-razr-i')],
|
| - ('Ubuntu12', 'GCC', 'Release', 'x86', 'RazrI', None, True, f, p) : [('Test', 'Android', 'RazrI', 'SGX540', None, 'base-android-razr-i'),
|
| - ('Perf', 'Android', 'RazrI', 'SGX540', None, None)],})
|
| + ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'NexusS', None, True, f, p) : [('Test', 'Android', 'NexusS', 'SGX540', None)],
|
| + ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'NexusS', None, True, f, p) : [('Test', 'Android', 'NexusS', 'SGX540', None),
|
| + ('Perf', 'Android', 'NexusS', 'SGX540', None)],
|
| + ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus4', None, True, f, p) : [('Test', 'Android', 'Nexus4', 'Adreno320', None)],
|
| + ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus4', None, True, f, p) : [('Test', 'Android', 'Nexus4', 'Adreno320', None),
|
| + ('Perf', 'Android', 'Nexus4', 'Adreno320', None)],
|
| + ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus7', None, True, f, p) : [('Test', 'Android', 'Nexus7', 'Tegra3', None)],
|
| + ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus7', None, True, f, p) : [('Test', 'Android', 'Nexus7', 'Tegra3', None),
|
| + ('Perf', 'Android', 'Nexus7', 'Tegra3', None)],
|
| + ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus10', None, True, f, p) : [('Test', 'Android', 'Nexus10', 'MaliT604', None)],
|
| + ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus10', None, True, f, p) : [('Test', 'Android', 'Nexus10', 'MaliT604', None),
|
| + ('Perf', 'Android', 'Nexus10', 'MaliT604', None)],
|
| + ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'GalaxyNexus', None, True, f, p) : [('Test', 'Android', 'GalaxyNexus','SGX540', None)],
|
| + ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'GalaxyNexus', None, True, f, p) : [('Test', 'Android', 'GalaxyNexus','SGX540', None),
|
| + ('Perf', 'Android', 'GalaxyNexus','SGX540', None)],
|
| + ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Xoom', None, True, f, p) : [('Test', 'Android', 'Xoom', 'Tegra2', None)],
|
| + ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Xoom', None, True, f, p) : [('Test', 'Android', 'Xoom', 'Tegra2', None),
|
| + ('Perf', 'Android', 'Xoom', 'Tegra2', None)],
|
| + ('Ubuntu12', 'GCC', 'Debug', 'x86', 'RazrI', None, True, f, p) : [('Test', 'Android', 'RazrI', 'SGX540', None)],
|
| + ('Ubuntu12', 'GCC', 'Release', 'x86', 'RazrI', None, True, f, p) : [('Test', 'Android', 'RazrI', 'SGX540', None),
|
| + ('Perf', 'Android', 'RazrI', 'SGX540', None)],})
|
| f = chromeos_factory.ChromeOSFactory
|
| builder_specs.update({
|
| - ('Ubuntu12', 'GCC', 'Debug', 'x86', 'Alex', None, True, f, p) : [('Test', 'ChromeOS', 'Alex', 'GMA3150', None, None)],
|
| - ('Ubuntu12', 'GCC', 'Release', 'x86', 'Alex', None, True, f, p) : [('Test', 'ChromeOS', 'Alex', 'GMA3150', None, None),
|
| - ('Perf', 'ChromeOS', 'Alex', 'GMA3150', None, None)],
|
| - ('Ubuntu12', 'GCC', 'Debug', 'x86_64', 'Link', None, True, f, p) : [('Test', 'ChromeOS', 'Link', 'HD4000', None, None)],
|
| - ('Ubuntu12', 'GCC', 'Release', 'x86_64', 'Link', None, True, f, p) : [('Test', 'ChromeOS', 'Link', 'HD4000', None, None),
|
| - ('Perf', 'ChromeOS', 'Link', 'HD4000', None, None)],
|
| - ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Daisy', None, True, f, p) : [('Test', 'ChromeOS', 'Daisy', 'MaliT604', None, None)],
|
| - ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Daisy', None, True, f, p) : [('Test', 'ChromeOS', 'Daisy', 'MaliT604', None, None),
|
| - ('Perf', 'ChromeOS', 'Daisy', 'MaliT604', None, None)],})
|
| + ('Ubuntu12', 'GCC', 'Debug', 'x86', 'Alex', None, True, f, p) : [('Test', 'ChromeOS', 'Alex', 'GMA3150', None)],
|
| + ('Ubuntu12', 'GCC', 'Release', 'x86', 'Alex', None, True, f, p) : [('Test', 'ChromeOS', 'Alex', 'GMA3150', None),
|
| + ('Perf', 'ChromeOS', 'Alex', 'GMA3150', None)],
|
| + ('Ubuntu12', 'GCC', 'Debug', 'x86_64', 'Link', None, True, f, p) : [('Test', 'ChromeOS', 'Link', 'HD4000', None)],
|
| + ('Ubuntu12', 'GCC', 'Release', 'x86_64', 'Link', None, True, f, p) : [('Test', 'ChromeOS', 'Link', 'HD4000', None),
|
| + ('Perf', 'ChromeOS', 'Link', 'HD4000', None)],
|
| + ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Daisy', None, True, f, p) : [('Test', 'ChromeOS', 'Daisy', 'MaliT604', None)],
|
| + ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Daisy', None, True, f, p) : [('Test', 'ChromeOS', 'Daisy', 'MaliT604', None),
|
| + ('Perf', 'ChromeOS', 'Daisy', 'MaliT604', None)],})
|
| f = ios_factory.iOSFactory
|
| p = skia_factory.TARGET_PLATFORM_MAC
|
| builder_specs.update({
|
| @@ -281,7 +281,6 @@
|
| gyp_defines=gyp_defines,
|
| factory_type=factory_type,
|
| target_platform=target_platform,
|
| - gm_image_subdir=dependent_builder[5],
|
| do_upload_results=do_upload_results,
|
| perf_output_basedir=perf_output_basedir,
|
| compile_warnings_as_errors=False,
|
|
|