| Index: tools/tests/factory_configuration/expected/Build-Mac10.6-GCC-x86_64-Release
|
| ===================================================================
|
| --- tools/tests/factory_configuration/expected/Build-Mac10.6-GCC-x86_64-Release (revision 8881)
|
| +++ tools/tests/factory_configuration/expected/Build-Mac10.6-GCC-x86_64-Release (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_Release_64',
|
| + '_builder_name': 'Build-Mac10.6-GCC-x86_64-Release',
|
| '_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_Release_64',
|
| + 'Build-Mac10.6-GCC-x86_64-Release',
|
| '--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": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},']"',
|
| + '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},']"',
|
| '--target',
|
| 'skia_base_libs',
|
| '--target',
|
| @@ -57,12 +57,11 @@
|
| '_do_upload_bench_results': <Object>,
|
| '_do_upload_results': <Object>,
|
| '_env_vars': {
|
| - 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=64 skia_warnings_as_errors=0',
|
| + 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64 skia_warnings_as_errors=0',
|
| },
|
| '_flavor': None,
|
| '_gclient_solutions': [
|
| '{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},',
|
| - '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},',
|
| ],
|
| '_make_flags': [],
|
| '_perf_output_basedir': None,
|
| @@ -84,9 +83,9 @@
|
| '--do_upload_results',
|
| 'True',
|
| '--gm_image_subdir',
|
| - 'base-macmini',
|
| + 'None',
|
| '--builder_name',
|
| - 'Skia_Mac_Float_Compile_Release_64',
|
| + 'Build-Mac10.6-GCC-x86_64-Release',
|
| '--target_platform',
|
| 'mac',
|
| '--revision',
|
| @@ -113,7 +112,7 @@
|
| 'description': 'UpdateScripts',
|
| 'doStepIf': <Object>,
|
| 'env': {
|
| - 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=64 skia_warnings_as_errors=0',
|
| + 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64 skia_warnings_as_errors=0',
|
| },
|
| 'get_props_from_stdout': None,
|
| 'haltOnFailure': <Object>,
|
| @@ -136,9 +135,9 @@
|
| '--do_upload_results',
|
| 'True',
|
| '--gm_image_subdir',
|
| - 'base-macmini',
|
| + 'None',
|
| '--builder_name',
|
| - 'Skia_Mac_Float_Compile_Release_64',
|
| + 'Build-Mac10.6-GCC-x86_64-Release',
|
| '--target_platform',
|
| 'mac',
|
| '--revision',
|
| @@ -162,12 +161,12 @@
|
| '--bench_pictures_cfg',
|
| 'default',
|
| '--gclient_solutions',
|
| - '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},']"',
|
| + '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},']"',
|
| ],
|
| 'description': 'Update',
|
| 'doStepIf': <Object>,
|
| 'env': {
|
| - 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=64 skia_warnings_as_errors=0',
|
| + 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64 skia_warnings_as_errors=0',
|
| },
|
| 'get_props_from_stdout': {
|
| 'got_revision': 'Skia updated to revision (\d+)',
|
| @@ -192,9 +191,9 @@
|
| '--do_upload_results',
|
| 'True',
|
| '--gm_image_subdir',
|
| - 'base-macmini',
|
| + 'None',
|
| '--builder_name',
|
| - 'Skia_Mac_Float_Compile_Release_64',
|
| + 'Build-Mac10.6-GCC-x86_64-Release',
|
| '--target_platform',
|
| 'mac',
|
| '--revision',
|
| @@ -218,14 +217,14 @@
|
| '--bench_pictures_cfg',
|
| 'default',
|
| '--gclient_solutions',
|
| - '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},']"',
|
| + '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},']"',
|
| '--target',
|
| 'skia_base_libs',
|
| ],
|
| 'description': 'BuildSkiaBaseLibs',
|
| 'doStepIf': <Object>,
|
| 'env': {
|
| - 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=64 skia_warnings_as_errors=0',
|
| + 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64 skia_warnings_as_errors=0',
|
| },
|
| 'get_props_from_stdout': None,
|
| 'haltOnFailure': <Object>,
|
| @@ -248,9 +247,9 @@
|
| '--do_upload_results',
|
| 'True',
|
| '--gm_image_subdir',
|
| - 'base-macmini',
|
| + 'None',
|
| '--builder_name',
|
| - 'Skia_Mac_Float_Compile_Release_64',
|
| + 'Build-Mac10.6-GCC-x86_64-Release',
|
| '--target_platform',
|
| 'mac',
|
| '--revision',
|
| @@ -274,7 +273,7 @@
|
| '--bench_pictures_cfg',
|
| 'default',
|
| '--gclient_solutions',
|
| - '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},']"',
|
| + '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},']"',
|
| '--target',
|
| 'skia_base_libs',
|
| '--target',
|
| @@ -283,7 +282,7 @@
|
| 'description': 'BuildTests',
|
| 'doStepIf': <Object>,
|
| 'env': {
|
| - 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=64 skia_warnings_as_errors=0',
|
| + 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64 skia_warnings_as_errors=0',
|
| },
|
| 'get_props_from_stdout': None,
|
| 'haltOnFailure': <Object>,
|
| @@ -306,9 +305,9 @@
|
| '--do_upload_results',
|
| 'True',
|
| '--gm_image_subdir',
|
| - 'base-macmini',
|
| + 'None',
|
| '--builder_name',
|
| - 'Skia_Mac_Float_Compile_Release_64',
|
| + 'Build-Mac10.6-GCC-x86_64-Release',
|
| '--target_platform',
|
| 'mac',
|
| '--revision',
|
| @@ -332,7 +331,7 @@
|
| '--bench_pictures_cfg',
|
| 'default',
|
| '--gclient_solutions',
|
| - '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},']"',
|
| + '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},']"',
|
| '--target',
|
| 'skia_base_libs',
|
| '--target',
|
| @@ -343,7 +342,7 @@
|
| 'description': 'BuildGM',
|
| 'doStepIf': <Object>,
|
| 'env': {
|
| - 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=64 skia_warnings_as_errors=0',
|
| + 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64 skia_warnings_as_errors=0',
|
| },
|
| 'get_props_from_stdout': None,
|
| 'haltOnFailure': <Object>,
|
| @@ -366,9 +365,9 @@
|
| '--do_upload_results',
|
| 'True',
|
| '--gm_image_subdir',
|
| - 'base-macmini',
|
| + 'None',
|
| '--builder_name',
|
| - 'Skia_Mac_Float_Compile_Release_64',
|
| + 'Build-Mac10.6-GCC-x86_64-Release',
|
| '--target_platform',
|
| 'mac',
|
| '--revision',
|
| @@ -392,7 +391,7 @@
|
| '--bench_pictures_cfg',
|
| 'default',
|
| '--gclient_solutions',
|
| - '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},']"',
|
| + '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},']"',
|
| '--target',
|
| 'skia_base_libs',
|
| '--target',
|
| @@ -405,7 +404,7 @@
|
| 'description': 'BuildTools',
|
| 'doStepIf': <Object>,
|
| 'env': {
|
| - 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=64 skia_warnings_as_errors=0',
|
| + 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64 skia_warnings_as_errors=0',
|
| },
|
| 'get_props_from_stdout': None,
|
| 'haltOnFailure': <Object>,
|
| @@ -428,9 +427,9 @@
|
| '--do_upload_results',
|
| 'True',
|
| '--gm_image_subdir',
|
| - 'base-macmini',
|
| + 'None',
|
| '--builder_name',
|
| - 'Skia_Mac_Float_Compile_Release_64',
|
| + 'Build-Mac10.6-GCC-x86_64-Release',
|
| '--target_platform',
|
| 'mac',
|
| '--revision',
|
| @@ -454,7 +453,7 @@
|
| '--bench_pictures_cfg',
|
| 'default',
|
| '--gclient_solutions',
|
| - '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},']"',
|
| + '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},']"',
|
| '--target',
|
| 'skia_base_libs',
|
| '--target',
|
| @@ -469,7 +468,7 @@
|
| 'description': 'BuildBench',
|
| 'doStepIf': <Object>,
|
| 'env': {
|
| - 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=64 skia_warnings_as_errors=0',
|
| + 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64 skia_warnings_as_errors=0',
|
| },
|
| 'get_props_from_stdout': None,
|
| 'haltOnFailure': <Object>,
|
| @@ -492,9 +491,9 @@
|
| '--do_upload_results',
|
| 'True',
|
| '--gm_image_subdir',
|
| - 'base-macmini',
|
| + 'None',
|
| '--builder_name',
|
| - 'Skia_Mac_Float_Compile_Release_64',
|
| + 'Build-Mac10.6-GCC-x86_64-Release',
|
| '--target_platform',
|
| 'mac',
|
| '--revision',
|
| @@ -518,7 +517,7 @@
|
| '--bench_pictures_cfg',
|
| 'default',
|
| '--gclient_solutions',
|
| - '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},', '{ "name": "gm-expected/base-macmini", "url": "http://skia.googlecode.com/svn/gm-expected/base-macmini", "custom_deps": {},"custom_vars": {},},']"',
|
| + '"['{ "name": "trunk", "url": "http://skia.googlecode.com/svn/trunk", "custom_deps": {},"custom_vars": {},},']"',
|
| '--target',
|
| 'skia_base_libs',
|
| '--target',
|
| @@ -535,7 +534,7 @@
|
| 'description': 'BuildMost',
|
| 'doStepIf': <Object>,
|
| 'env': {
|
| - 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_scalar=float skia_arch_width=64 skia_warnings_as_errors=0',
|
| + 'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64 skia_warnings_as_errors=0',
|
| },
|
| 'get_props_from_stdout': None,
|
| 'haltOnFailure': <Object>,
|
|
|