Index: scripts/slave/recipe_modules/chromium/chromium_mac.py |
diff --git a/scripts/slave/recipe_modules/chromium/chromium_mac.py b/scripts/slave/recipe_modules/chromium/chromium_mac.py |
index 6d140e24f109f36d8fc6aee102040428147ce19c..07e3800e05e1ce39443fe44337508f4733b20ae9 100644 |
--- a/scripts/slave/recipe_modules/chromium/chromium_mac.py |
+++ b/scripts/slave/recipe_modules/chromium/chromium_mac.py |
@@ -25,7 +25,7 @@ SPEC = { |
'enable_swarming': True, |
'use_isolate': True, |
}, |
- 'Mac10.6 Tests (1)': { |
+ 'Mac10.6 Tests': { |
'recipe_config': 'chromium', |
'chromium_config_kwargs': { |
'BUILD_CONFIG': 'Release', |
@@ -45,7 +45,7 @@ SPEC = { |
'os': 'Mac-10.6', |
}, |
}, |
- 'Mac10.7 Tests (1)': { |
+ 'Mac10.8 Tests': { |
'recipe_config': 'chromium', |
'chromium_config_kwargs': { |
'BUILD_CONFIG': 'Release', |
@@ -59,46 +59,45 @@ SPEC = { |
'parent_buildername': 'Mac Builder', |
'testing': { |
'platform': 'mac', |
+ 'os': 'Mac-10.8', |
}, |
'enable_swarming': True, |
}, |
- 'Mac Builder (dbg)': { |
+ 'Mac10.9 Tests': { |
'recipe_config': 'chromium', |
'chromium_config_kwargs': { |
- 'BUILD_CONFIG': 'Debug', |
+ 'BUILD_CONFIG': 'Release', |
'TARGET_BITS': 32, |
}, |
- 'bot_type': 'builder', |
- 'compile_targets': [ |
- 'chromium_builder_tests', |
+ 'test_generators': [ |
+ steps.generate_gtest, |
+ steps.generate_script, |
], |
+ 'bot_type': 'tester', |
+ 'parent_buildername': 'Mac Builder', |
'testing': { |
'platform': 'mac', |
+ 'os': 'Mac-10.9', |
M-A Ruel
2014/11/04 23:10:30
It should be in section 'swarming_dimensions'.
Robert Sesek
2014/11/04 23:22:16
Fixed with https://codereview.chromium.org/6931830
|
}, |
'enable_swarming': True, |
- 'use_isolate': True, |
}, |
- 'Mac 10.6 Tests (dbg)(1)': { |
+ 'Mac Builder (dbg)': { |
'recipe_config': 'chromium', |
'chromium_config_kwargs': { |
'BUILD_CONFIG': 'Debug', |
'TARGET_BITS': 32, |
}, |
- 'test_generators': [ |
- steps.generate_gtest, |
- steps.generate_script, |
+ 'bot_type': 'builder', |
+ 'compile_targets': [ |
+ 'chromium_builder_tests', |
], |
- 'bot_type': 'tester', |
- 'parent_buildername': 'Mac Builder (dbg)', |
'testing': { |
'platform': 'mac', |
}, |
'enable_swarming': True, |
- 'swarming_dimensions': { |
- 'os': 'Mac-10.6', |
- }, |
+ 'use_isolate': True, |
}, |
- 'Mac 10.7 Tests (dbg)(1)': { |
+ 'Mac10.9 Tests (dbg)': { |
'recipe_config': 'chromium', |
'chromium_config_kwargs': { |
'BUILD_CONFIG': 'Debug', |
@@ -114,6 +113,9 @@ SPEC = { |
'platform': 'mac', |
}, |
'enable_swarming': True, |
+ 'swarming_dimensions': { |
+ 'os': 'Mac-10.9', |
+ }, |
}, |
'iOS Device': { |
'recipe_config': 'chromium_ios_device', |