| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid__dbg_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid__dbg_.json
|
| similarity index 77%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid__dbg_.json
|
| index 172974720b0c893e8bedcc04d6d27f343852c2db..9ac34cec8d698db50417a4927490970fa3dc26bf 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid__dbg_.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]/ClangToTAndroidASan",
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -40,7 +40,7 @@
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan",
|
| + "cwd": "[BUILDER_CACHE]/ClangToTAndroid__dbg_",
|
| "env": {
|
| "GCLIENT_KILL_GIT_FETCH_AFTER": "1200",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| @@ -128,14 +128,14 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan/src",
|
| + "cwd": "[BUILDER_CACHE]/ClangToTAndroid__dbg_/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 asan=1 clang=1 clang_use_chrome_plugins=0 component=shared_library fastbuild=1 target_arch=arm",
|
| + "GYP_DEFINES": "OS=android clang=1 clang_use_chrome_plugins=0 component=shared_library fastbuild=1 target_arch=arm",
|
| "LLVM_FORCE_HEAD_REVISION": "YES",
|
| - "PATH": "[BUILDER_CACHE]/ClangToTAndroidASan/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroidASan/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + "PATH": "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -143,16 +143,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/ClangToTAndroidASan/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Debug",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/ClangToTAndroidASan/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__dbg_/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"ClangToTAndroidASan\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| + "{\"buildername\": \"ClangToTAndroid (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -165,12 +165,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/ClangToTAndroidASan/src/testing/buildbot/chromium.fyi.json",
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.fyi.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/ClangToTAndroidASan/src/testing/buildbot/chromium.fyi.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/ClangToTAndroid__dbg_/src/testing/buildbot/chromium.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -191,10 +191,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]/ClangToTAndroidASan/src/out/Debug/debug_info_dumps",
|
| - "[BUILDER_CACHE]/ClangToTAndroidASan/src/out/Debug/test_logs",
|
| - "[BUILDER_CACHE]/ClangToTAndroidASan/src/out/build_product.zip",
|
| - "[BUILDER_CACHE]/ClangToTAndroidASan/src"
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/out/Debug/debug_info_dumps",
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/out/Debug/test_logs",
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/out/build_product.zip",
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src"
|
| ],
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| @@ -215,8 +215,8 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[BUILDER_CACHE]/ClangToTAndroidASan/src/build/tree_truth.sh",
|
| - "[BUILDER_CACHE]/ClangToTAndroidASan/src",
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/build/tree_truth.sh",
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src",
|
| "src"
|
| ],
|
| "name": "tree truth steps"
|
| @@ -225,17 +225,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/ClangToTAndroidASan/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "chromium.fyi",
|
| "-b",
|
| - "ClangToTAndroidASan",
|
| + "ClangToTAndroid (dbg)",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/ClangToTAndroidASan/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/tools/mb/mb_config.pyl",
|
| "//out/Debug"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan/src",
|
| + "cwd": "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -248,14 +248,14 @@
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/ClangToTAndroidASan/src",
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "LLVM_FORCE_HEAD_REVISION": "YES",
|
| - "PATH": "[BUILDER_CACHE]/ClangToTAndroidASan/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroidASan/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/build/android:%(PATH)s"
|
| },
|
| "name": "clang_revision",
|
| "~followup_annotations": [
|
| @@ -280,11 +280,11 @@
|
| "--target",
|
| "Debug",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/ClangToTAndroidASan/src",
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "ClangToTAndroidASan",
|
| + "ClangToTAndroid (dbg)",
|
| "--buildbot-mastername",
|
| "chromium.fyi",
|
| "--buildbot-slavename",
|
| @@ -301,11 +301,39 @@
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "LLVM_FORCE_HEAD_REVISION": "YES",
|
| - "PATH": "[BUILDER_CACHE]/ClangToTAndroidASan/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroidASan/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroid__dbg_/src/build/android:%(PATH)s"
|
| },
|
| "name": "compile"
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| + "--show-path",
|
| + "python",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/zip_build.py",
|
| + "--target",
|
| + "Debug",
|
| + "--gsutil-py-path",
|
| + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| + "--staging-dir",
|
| + "[CACHE]/chrome_staging",
|
| + "--src-dir",
|
| + "[BUILDER_CACHE]/ClangToTAndroid__dbg_/src",
|
| + "--build-url",
|
| + "gs://chromium-fyi-archive/chromium.fyi/ClangToTAndroid (dbg)",
|
| + "--build_revision",
|
| + "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"ClangToTAndroid (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"ClangToTAndroid (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| + ],
|
| + "name": "package build"
|
| + },
|
| + {
|
| "name": "$result",
|
| "recipe_result": null,
|
| "status_code": 0
|
|
|