| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid_x86.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Cast_Android__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid_x86.json
|
| similarity index 86%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_linux_Cast_Android__dbg_.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid_x86.json
|
| index f2edf764321990ba05d5bc7fddc0c0feff164837..d12dfbf56742cb1372ce61c42f4b547ae3acbad0 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Cast_Android__dbg_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid_x86.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]/Cast_Android__dbg_",
|
| + "[BUILDER_CACHE]/ClangToTAndroid_x86",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -40,7 +40,7 @@
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Cast_Android__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/ClangToTAndroid_x86",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -185,13 +185,13 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Cast_Android__dbg_/src",
|
| + "cwd": "[BUILDER_CACHE]/ClangToTAndroid_x86/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 chromecast=1 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=arm use_goma=1",
|
| - "PATH": "[BUILDER_CACHE]/Cast_Android__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Cast_Android__dbg_/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/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroid_x86/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -199,17 +199,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Cast_Android__dbg_/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/ClangToTAndroid_x86/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| - "Debug",
|
| - "--use-src-side-runtest-py",
|
| + "Release",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/Cast_Android__dbg_/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/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Cast Android (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| + "{\"buildername\": \"ClangToTAndroid x86\", \"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]/Cast_Android__dbg_/src/testing/buildbot/chromium.linux.json",
|
| + "[BUILDER_CACHE]/ClangToTAndroid_x86/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "name": "read test spec (chromium.linux.json)",
|
| + "name": "read test spec (chromium.fyi.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/Cast_Android__dbg_/src/testing/buildbot/chromium.linux.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/ClangToTAndroid_x86/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]/Cast_Android__dbg_/src/out/Debug/debug_info_dumps",
|
| - "[BUILDER_CACHE]/Cast_Android__dbg_/src/out/Debug/test_logs",
|
| - "[BUILDER_CACHE]/Cast_Android__dbg_/src/out/build_product.zip",
|
| - "[BUILDER_CACHE]/Cast_Android__dbg_/src"
|
| + "[BUILDER_CACHE]/ClangToTAndroid_x86/src/out/Release/debug_info_dumps",
|
| + "[BUILDER_CACHE]/ClangToTAndroid_x86/src/out/Release/test_logs",
|
| + "[BUILDER_CACHE]/ClangToTAndroid_x86/src/out/build_product.zip",
|
| + "[BUILDER_CACHE]/ClangToTAndroid_x86/src"
|
| ],
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| @@ -272,8 +271,8 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[BUILDER_CACHE]/Cast_Android__dbg_/src/build/tree_truth.sh",
|
| - "[BUILDER_CACHE]/Cast_Android__dbg_/src",
|
| + "[BUILDER_CACHE]/ClangToTAndroid_x86/src/build/tree_truth.sh",
|
| + "[BUILDER_CACHE]/ClangToTAndroid_x86/src",
|
| "src"
|
| ],
|
| "name": "tree truth steps"
|
| @@ -282,19 +281,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Cast_Android__dbg_/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/ClangToTAndroid_x86/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| - "chromium.linux",
|
| + "chromium.fyi",
|
| "-b",
|
| - "Cast Android (dbg)",
|
| + "ClangToTAndroid x86",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/Cast_Android__dbg_/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/ClangToTAndroid_x86/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| - "//out/Debug"
|
| + "//out/Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Cast_Android__dbg_/src",
|
| + "cwd": "[BUILDER_CACHE]/ClangToTAndroid_x86/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -313,19 +312,19 @@
|
| "--ninja-path",
|
| "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
|
| "--target",
|
| - "Debug",
|
| + "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Cast_Android__dbg_/src",
|
| + "[BUILDER_CACHE]/ClangToTAndroid_x86/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "Cast Android (dbg)",
|
| + "ClangToTAndroid x86",
|
| "--buildbot-mastername",
|
| - "chromium.linux",
|
| + "chromium.fyi",
|
| "--buildbot-slavename",
|
| "TestSlavename",
|
| "--goma-deps-cache-file",
|
| - "Cast_Android__dbg_.gomadeps",
|
| + "ClangToTAndroid_x86.gomadeps",
|
| "--build-data-dir",
|
| "[ROOT]/build_data_dir",
|
| "--compiler",
|
| @@ -336,12 +335,11 @@
|
| "/creds/service_accounts/service-account-goma-client.json",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| - "--",
|
| - "cast_shell_apk"
|
| + "--"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Cast_Android__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Cast_Android__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/ClangToTAndroid_x86/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroid_x86/src/build/android:%(PATH)s"
|
| },
|
| "name": "compile",
|
| "~followup_annotations": [
|
|
|