Index: tools/tests/factory_configuration/expected/Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus |
=================================================================== |
--- tools/tests/factory_configuration/expected/Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus (revision 8881) |
+++ tools/tests/factory_configuration/expected/Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus (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_GalaxyNexus_4-1_Float_Compile_Debug_32', |
+ '_builder_name': 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus', |
'_common_args': [ |
'--autogen_svn_baseurl', |
'https://skia-autogen.googlecode.com/svn', |
@@ -11,9 +11,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-android-galaxy-nexus', |
+ 'None', |
'--builder_name', |
- 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32', |
+ 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus', |
'--target_platform', |
'linux', |
'--revision', |
@@ -45,7 +45,7 @@ |
'--android_sdk_root', |
<Object>, |
'--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-android-galaxy-nexus", "url": "http://skia.googlecode.com/svn/gm-expected/base-android-galaxy-nexus", "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": {},},']"', |
'--target', |
'all', |
], |
@@ -56,13 +56,12 @@ |
'_do_upload_bench_results': <Object>, |
'_do_upload_results': <Object>, |
'_env_vars': { |
- 'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'_flavor': 'android', |
'_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-android-galaxy-nexus", "url": "http://skia.googlecode.com/svn/gm-expected/base-android-galaxy-nexus", "custom_deps": {},"custom_vars": {},},', |
], |
'_make_flags': [], |
'_perf_output_basedir': None, |
@@ -84,9 +83,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-android-galaxy-nexus', |
+ 'None', |
'--builder_name', |
- 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32', |
+ 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus', |
'--target_platform', |
'linux', |
'--revision', |
@@ -121,7 +120,7 @@ |
'description': 'UpdateScripts', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': None, |
'haltOnFailure': <Object>, |
@@ -144,9 +143,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-android-galaxy-nexus', |
+ 'None', |
'--builder_name', |
- 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32', |
+ 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus', |
'--target_platform', |
'linux', |
'--revision', |
@@ -178,12 +177,12 @@ |
'--android_sdk_root', |
<Object>, |
'--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-android-galaxy-nexus", "url": "http://skia.googlecode.com/svn/gm-expected/base-android-galaxy-nexus", "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": {},},']"', |
], |
'description': 'Update', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': { |
'got_revision': 'Skia updated to revision (\d+)', |
@@ -208,9 +207,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-android-galaxy-nexus', |
+ 'None', |
'--builder_name', |
- 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32', |
+ 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus', |
'--target_platform', |
'linux', |
'--revision', |
@@ -242,12 +241,12 @@ |
'--android_sdk_root', |
<Object>, |
'--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-android-galaxy-nexus", "url": "http://skia.googlecode.com/svn/gm-expected/base-android-galaxy-nexus", "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": {},},']"', |
], |
'description': 'Clean', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': None, |
'haltOnFailure': <Object>, |
@@ -270,9 +269,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-android-galaxy-nexus', |
+ 'None', |
'--builder_name', |
- 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32', |
+ 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus', |
'--target_platform', |
'linux', |
'--revision', |
@@ -304,14 +303,14 @@ |
'--android_sdk_root', |
<Object>, |
'--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-android-galaxy-nexus", "url": "http://skia.googlecode.com/svn/gm-expected/base-android-galaxy-nexus", "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": {},},']"', |
'--target', |
'all', |
], |
'description': 'BuildAll', |
'doStepIf': <Object>, |
'env': { |
- 'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_warnings_as_errors=1', |
+ 'GYP_DEFINES': 'skia_arch_width=32 skia_warnings_as_errors=1', |
}, |
'get_props_from_stdout': None, |
'haltOnFailure': <Object>, |