| 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 8a4b8813e58570dd036d1dd43250f032ac955ae2..e28e53e79d92d29ddf9be67723fc387b7c65785b 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',
|
| @@ -49,7 +49,7 @@ SPEC = {
|
| 'os': 'Mac-10.6',
|
| },
|
| },
|
| - 'Mac10.7 Tests (1)': {
|
| + 'Mac10.8 Tests': {
|
| 'recipe_config': 'chromium',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| @@ -70,47 +70,47 @@ SPEC = {
|
| },
|
| '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,
|
| + ],
|
| + 'tests': [
|
| + steps.NaclIntegrationTest(),
|
| + steps.TelemetryUnitTests(),
|
| + steps.TelemetryPerfUnitTests(),
|
| ],
|
| + 'bot_type': 'tester',
|
| + 'parent_buildername': 'Mac Builder',
|
| 'testing': {
|
| 'platform': 'mac',
|
| },
|
| 'enable_swarming': True,
|
| - 'use_isolate': True,
|
| + 'swarming_dimensions': {
|
| + 'os': 'Mac-10.9',
|
| + },
|
| },
|
| - '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,
|
| - ],
|
| - 'tests': [
|
| - steps.NaclIntegrationTest(),
|
| - steps.TelemetryUnitTests(),
|
| - steps.TelemetryPerfUnitTests(),
|
| + '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',
|
|
|