Index: tools/tests/factory_configuration/expected/Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus-Trybot |
=================================================================== |
--- tools/tests/factory_configuration/expected/Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus-Trybot (revision 8881) |
+++ tools/tests/factory_configuration/expected/Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus-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_GalaxyNexus_4-1_Float_Compile_Debug_32_Trybot', |
+ '_builder_name': 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus-Trybot', |
'_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_Trybot', |
+ 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus-Trybot', |
'--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": "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', |
@@ -60,13 +60,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": {},},', |
'{ "name": "gm-expected", "url": "http://skia.googlecode.com/svn/gm-expected", "custom_deps": {},"custom_vars": {},},', |
], |
'_make_flags': [], |
@@ -89,9 +88,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-android-galaxy-nexus', |
+ 'None', |
'--builder_name', |
- 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32_Trybot', |
+ 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus-Trybot', |
'--target_platform', |
'linux', |
'--revision', |
@@ -126,7 +125,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>, |
@@ -149,9 +148,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-android-galaxy-nexus', |
+ 'None', |
'--builder_name', |
- 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32_Trybot', |
+ 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus-Trybot', |
'--target_platform', |
'linux', |
'--revision', |
@@ -183,12 +182,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": "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_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+)', |
@@ -213,9 +212,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-android-galaxy-nexus', |
+ 'None', |
'--builder_name', |
- 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32_Trybot', |
+ 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus-Trybot', |
'--target_platform', |
'linux', |
'--revision', |
@@ -247,7 +246,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": "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', |
@@ -256,7 +255,7 @@ |
'description': 'ApplyPatch', |
'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>, |
@@ -279,9 +278,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-android-galaxy-nexus', |
+ 'None', |
'--builder_name', |
- 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32_Trybot', |
+ 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus-Trybot', |
'--target_platform', |
'linux', |
'--revision', |
@@ -313,7 +312,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": "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', |
@@ -322,7 +321,7 @@ |
'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>, |
@@ -345,9 +344,9 @@ |
'--do_upload_results', |
'True', |
'--gm_image_subdir', |
- 'base-android-galaxy-nexus', |
+ 'None', |
'--builder_name', |
- 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32_Trybot', |
+ 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus-Trybot', |
'--target_platform', |
'linux', |
'--revision', |
@@ -379,7 +378,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": "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', |
@@ -390,7 +389,7 @@ |
'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>, |