Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid_x86_Tester.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Android_Release__Nexus_6_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid_x86_Tester.json |
similarity index 86% |
copy from scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Android_Release__Nexus_6_.json |
copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid_x86_Tester.json |
index 6c8a81f6ae9ec61ee88315e2e2fc4cdc0b7649f0..a039211c0f7a801a44b368c316246f3d270a4a31 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Android_Release__Nexus_6_.json |
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid_x86_Tester.json |
@@ -4,7 +4,7 @@ |
"python", |
"-u", |
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", |
- "[BUILDER_CACHE]/Android_Release__Nexus_6_", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester", |
"511" |
], |
"name": "makedirs checkout path", |
@@ -40,7 +40,7 @@ |
"src@HEAD", |
"--output_manifest" |
], |
- "cwd": "[BUILDER_CACHE]/Android_Release__Nexus_6_", |
+ "cwd": "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -185,13 +185,13 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
- "cwd": "[BUILDER_CACHE]/Android_Release__Nexus_6_/src", |
+ "cwd": "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"GYP_CHROMIUM_NO_ACTION": "1", |
"GYP_CROSSCOMPILE": "1", |
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=arm use_goma=1", |
- "PATH": "[BUILDER_CACHE]/Android_Release__Nexus_6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Release__Nexus_6_/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1", |
+ "PATH": "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
}, |
@@ -199,17 +199,16 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILDER_CACHE]/Android_Release__Nexus_6_/src/testing/scripts/get_compile_targets.py", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src/testing/scripts/get_compile_targets.py", |
"--output", |
"/path/to/tmp/json", |
"--", |
"--build-config-fs", |
"Release", |
- "--use-src-side-runtest-py", |
"--paths", |
- "{\"checkout\": \"[BUILDER_CACHE]/Android_Release__Nexus_6_/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", |
+ "{\"checkout\": \"[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", |
"--properties", |
- "{\"buildername\": \"Android Release (Nexus 6)\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}" |
+ "{\"buildername\": \"ClangToTAndroid x86 Tester\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}" |
], |
"name": "get compile targets for scripts", |
"~followup_annotations": [ |
@@ -222,12 +221,12 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[BUILDER_CACHE]/Android_Release__Nexus_6_/src/testing/buildbot/chromium.gpu.fyi.json", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src/testing/buildbot/chromium.fyi.json", |
"/path/to/tmp/json" |
], |
- "name": "read test spec (chromium.gpu.fyi.json)", |
+ "name": "read test spec (chromium.fyi.json)", |
"~followup_annotations": [ |
- "@@@STEP_TEXT@path: [BUILDER_CACHE]/Android_Release__Nexus_6_/src/testing/buildbot/chromium.gpu.fyi.json@@@", |
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src/testing/buildbot/chromium.fyi.json@@@", |
"@@@STEP_LOG_LINE@json.output@{}@@@", |
"@@@STEP_LOG_END@json.output@@@" |
] |
@@ -248,10 +247,10 @@ |
"python", |
"-u", |
"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n", |
- "[BUILDER_CACHE]/Android_Release__Nexus_6_/src/out/Release/debug_info_dumps", |
- "[BUILDER_CACHE]/Android_Release__Nexus_6_/src/out/Release/test_logs", |
- "[BUILDER_CACHE]/Android_Release__Nexus_6_/src/out/build_product.zip", |
- "[BUILDER_CACHE]/Android_Release__Nexus_6_/src" |
+ "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src/out/Release/debug_info_dumps", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src/out/Release/test_logs", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src/out/build_product.zip", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src" |
], |
"name": "clean local files", |
"~followup_annotations": [ |
@@ -272,8 +271,8 @@ |
}, |
{ |
"cmd": [ |
- "[BUILDER_CACHE]/Android_Release__Nexus_6_/src/build/tree_truth.sh", |
- "[BUILDER_CACHE]/Android_Release__Nexus_6_/src", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src/build/tree_truth.sh", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src", |
"src" |
], |
"name": "tree truth steps" |
@@ -282,19 +281,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILDER_CACHE]/Android_Release__Nexus_6_/src/tools/mb/mb.py", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src/tools/mb/mb.py", |
"gen", |
"-m", |
- "chromium.gpu.fyi", |
+ "chromium.fyi", |
"-b", |
- "Android Release (Nexus 6)", |
+ "ClangToTAndroid x86 Tester", |
"--config-file", |
- "[BUILDER_CACHE]/Android_Release__Nexus_6_/src/tools/mb/mb_config.pyl", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
"[CACHE]/cipd/goma", |
"//out/Release" |
], |
- "cwd": "[BUILDER_CACHE]/Android_Release__Nexus_6_/src", |
+ "cwd": "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -315,17 +314,17 @@ |
"--target", |
"Release", |
"--src-dir", |
- "[BUILDER_CACHE]/Android_Release__Nexus_6_/src", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src", |
"--goma-cache-dir", |
"[GOMA_CACHE]", |
"--buildbot-buildername", |
- "Android Release (Nexus 6)", |
+ "ClangToTAndroid x86 Tester", |
"--buildbot-mastername", |
- "chromium.gpu.fyi", |
+ "chromium.fyi", |
"--buildbot-slavename", |
"TestSlavename", |
"--goma-deps-cache-file", |
- "Android_Release__Nexus_6_.gomadeps", |
+ "ClangToTAndroid_x86_Tester.gomadeps", |
"--build-data-dir", |
"[ROOT]/build_data_dir", |
"--compiler", |
@@ -340,7 +339,7 @@ |
], |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[BUILDER_CACHE]/Android_Release__Nexus_6_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Release__Nexus_6_/src/build/android:%(PATH)s" |
+ "PATH": "[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroid_x86_Tester/src/build/android:%(PATH)s" |
}, |
"name": "compile", |
"~followup_annotations": [ |