Index: tools/tests/factory_configuration/expected/Build-Mac10.6-GCC-x86-Debug-Trybot |
=================================================================== |
--- tools/tests/factory_configuration/expected/Build-Mac10.6-GCC-x86-Debug-Trybot (revision 8881) |
+++ tools/tests/factory_configuration/expected/Build-Mac10.6-GCC-x86-Debug-Trybot (working copy) |
@@ -2,7 +2,7 @@ |
'TargetPathJoin': <Object>, |
'_autogen_svn_password_file': '.autogen_svn_password', |
'_autogen_svn_username_file': '.autogen_svn_username', |
- '_builder_name': 'Skia_Mac_Float_Compile_Debug_32_Trybot', |
+ '_builder_name': 'Build-Mac10.6-GCC-x86-Debug-Trybot', |
'_common_args': [ |
'--autogen_svn_baseurl', |
'https://skia-autogen.googlecode.com/svn', |
@@ -11,9 +11,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-macmini', |
+ 'None', |
'--builder_name', |
- 'Skia_Mac_Float_Compile_Debug_32_Trybot', |
+ 'Build-Mac10.6-GCC-x86-Debug-Trybot', |
'--target_platform', |
'mac', |
'--revision', |
@@ -37,7 +37,7 @@ |
'--bench_pictures_cfg', |
'default', |
'--gclient_solutions', |
- '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
+ '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
'--patch', |
<Object>, |
'--patch_root', |
@@ -61,13 +61,12 @@ |
'_do_upload_bench_results': <Object>, |
'_do_upload_results': <Object>, |
'_env_vars': { |
- 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=32 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'_flavor': None, |
'_gclient_solutions': [ |
'{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', |
'{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', |
- '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},', |
'{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},', |
], |
'_make_flags': [], |
@@ -90,9 +89,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-macmini', |
+ 'None', |
'--builder_name', |
- 'Skia_Mac_Float_Compile_Debug_32_Trybot', |
+ 'Build-Mac10.6-GCC-x86-Debug-Trybot', |
'--target_platform', |
'mac', |
'--revision', |
@@ -119,7 +118,7 @@ |
'description': 'UpdateScripts', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=32 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': None, |
'haltOnFailure': <Object>, |
@@ -142,9 +141,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-macmini', |
+ 'None', |
'--builder_name', |
- 'Skia_Mac_Float_Compile_Debug_32_Trybot', |
+ 'Build-Mac10.6-GCC-x86-Debug-Trybot', |
'--target_platform', |
'mac', |
'--revision', |
@@ -168,12 +167,12 @@ |
'--bench_pictures_cfg', |
'default', |
'--gclient_solutions', |
- '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
+ '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
], |
'description': 'Update', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=32 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': { |
'got_revision': 'Skia updated to revision (\d+)', |
@@ -198,9 +197,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-macmini', |
+ 'None', |
'--builder_name', |
- 'Skia_Mac_Float_Compile_Debug_32_Trybot', |
+ 'Build-Mac10.6-GCC-x86-Debug-Trybot', |
'--target_platform', |
'mac', |
'--revision', |
@@ -224,7 +223,7 @@ |
'--bench_pictures_cfg', |
'default', |
'--gclient_solutions', |
- '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
+ '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
'--patch', |
<Object>, |
'--patch_root', |
@@ -233,7 +232,7 @@ |
'description': 'ApplyPatch', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=32 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': None, |
'haltOnFailure': <Object>, |
@@ -256,9 +255,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-macmini', |
+ 'None', |
'--builder_name', |
- 'Skia_Mac_Float_Compile_Debug_32_Trybot', |
+ 'Build-Mac10.6-GCC-x86-Debug-Trybot', |
'--target_platform', |
'mac', |
'--revision', |
@@ -282,7 +281,7 @@ |
'--bench_pictures_cfg', |
'default', |
'--gclient_solutions', |
- '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
+ '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
'--patch', |
<Object>, |
'--patch_root', |
@@ -291,7 +290,7 @@ |
'description': 'Clean', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=32 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': None, |
'haltOnFailure': <Object>, |
@@ -314,9 +313,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-macmini', |
+ 'None', |
'--builder_name', |
- 'Skia_Mac_Float_Compile_Debug_32_Trybot', |
+ 'Build-Mac10.6-GCC-x86-Debug-Trybot', |
'--target_platform', |
'mac', |
'--revision', |
@@ -340,7 +339,7 @@ |
'--bench_pictures_cfg', |
'default', |
'--gclient_solutions', |
- '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
+ '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
'--patch', |
<Object>, |
'--patch_root', |
@@ -351,7 +350,7 @@ |
'description': 'BuildSkiaBaseLibs', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=32 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': None, |
'haltOnFailure': <Object>, |
@@ -374,9 +373,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-macmini', |
+ 'None', |
'--builder_name', |
- 'Skia_Mac_Float_Compile_Debug_32_Trybot', |
+ 'Build-Mac10.6-GCC-x86-Debug-Trybot', |
'--target_platform', |
'mac', |
'--revision', |
@@ -400,7 +399,7 @@ |
'--bench_pictures_cfg', |
'default', |
'--gclient_solutions', |
- '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
+ '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
'--patch', |
<Object>, |
'--patch_root', |
@@ -413,7 +412,7 @@ |
'description': 'BuildTests', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=32 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': None, |
'haltOnFailure': <Object>, |
@@ -436,9 +435,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-macmini', |
+ 'None', |
'--builder_name', |
- 'Skia_Mac_Float_Compile_Debug_32_Trybot', |
+ 'Build-Mac10.6-GCC-x86-Debug-Trybot', |
'--target_platform', |
'mac', |
'--revision', |
@@ -462,7 +461,7 @@ |
'--bench_pictures_cfg', |
'default', |
'--gclient_solutions', |
- '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
+ '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
'--patch', |
<Object>, |
'--patch_root', |
@@ -477,7 +476,7 @@ |
'description': 'BuildGM', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=32 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': None, |
'haltOnFailure': <Object>, |
@@ -500,9 +499,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-macmini', |
+ 'None', |
'--builder_name', |
- 'Skia_Mac_Float_Compile_Debug_32_Trybot', |
+ 'Build-Mac10.6-GCC-x86-Debug-Trybot', |
'--target_platform', |
'mac', |
'--revision', |
@@ -526,7 +525,7 @@ |
'--bench_pictures_cfg', |
'default', |
'--gclient_solutions', |
- '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
+ '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
'--patch', |
<Object>, |
'--patch_root', |
@@ -543,7 +542,7 @@ |
'description': 'BuildTools', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=32 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': None, |
'haltOnFailure': <Object>, |
@@ -566,9 +565,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-macmini', |
+ 'None', |
'--builder_name', |
- 'Skia_Mac_Float_Compile_Debug_32_Trybot', |
+ 'Build-Mac10.6-GCC-x86-Debug-Trybot', |
'--target_platform', |
'mac', |
'--revision', |
@@ -592,7 +591,7 @@ |
'--bench_pictures_cfg', |
'default', |
'--gclient_solutions', |
- '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
+ '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
'--patch', |
<Object>, |
'--patch_root', |
@@ -611,7 +610,7 @@ |
'description': 'BuildBench', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=32 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': None, |
'haltOnFailure': <Object>, |
@@ -634,9 +633,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-macmini', |
+ 'None', |
'--builder_name', |
- 'Skia_Mac_Float_Compile_Debug_32_Trybot', |
+ 'Build-Mac10.6-GCC-x86-Debug-Trybot', |
'--target_platform', |
'mac', |
'--revision', |
@@ -660,7 +659,7 @@ |
'--bench_pictures_cfg', |
'default', |
'--gclient_solutions', |
- '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
+ '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "android", "url": "http://skia.googlecode.com/svn/android", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},']"', |
'--patch', |
<Object>, |
'--patch_root', |
@@ -681,7 +680,7 @@ |
'description': 'BuildMost', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=32 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': None, |
'haltOnFailure': <Object>, |