Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid_x64.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid_x64.json |
similarity index 88% |
copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan.json |
copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid_x64.json |
index d42464f425d3f9e68dfd9b92dfa12aba0902c3bd..14810ba413ebf01bc44ff0068216e82b72a684f5 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan.json |
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroid_x64.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_x64", |
"511" |
], |
"name": "makedirs checkout path", |
@@ -40,7 +40,7 @@ |
"src@HEAD", |
"--output_manifest" |
], |
- "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan", |
+ "cwd": "[BUILDER_CACHE]/ClangToTAndroid_x64", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -127,14 +127,14 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
- "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan/src", |
+ "cwd": "[BUILDER_CACHE]/ClangToTAndroid_x64/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=static_library fastbuild=1 target_arch=x64", |
"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_x64/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroid_x64/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
}, |
@@ -142,16 +142,16 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILDER_CACHE]/ClangToTAndroidASan/src/testing/scripts/get_compile_targets.py", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x64/src/testing/scripts/get_compile_targets.py", |
"--output", |
"/path/to/tmp/json", |
"--", |
"--build-config-fs", |
- "Debug", |
+ "Release", |
"--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_x64/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 x64\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}" |
], |
"name": "get compile targets for scripts", |
"~followup_annotations": [ |
@@ -164,12 +164,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_x64/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_x64/src/testing/buildbot/chromium.fyi.json@@@", |
"@@@STEP_LOG_LINE@json.output@{}@@@", |
"@@@STEP_LOG_END@json.output@@@" |
] |
@@ -190,10 +190,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_x64/src/out/Release/debug_info_dumps", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x64/src/out/Release/test_logs", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x64/src/out/build_product.zip", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x64/src" |
], |
"name": "clean local files", |
"~followup_annotations": [ |
@@ -214,8 +214,8 @@ |
}, |
{ |
"cmd": [ |
- "[BUILDER_CACHE]/ClangToTAndroidASan/src/build/tree_truth.sh", |
- "[BUILDER_CACHE]/ClangToTAndroidASan/src", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x64/src/build/tree_truth.sh", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x64/src", |
"src" |
], |
"name": "tree truth steps" |
@@ -224,17 +224,17 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILDER_CACHE]/ClangToTAndroidASan/src/tools/mb/mb.py", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x64/src/tools/mb/mb.py", |
"gen", |
"-m", |
"chromium.fyi", |
"-b", |
- "ClangToTAndroidASan", |
+ "ClangToTAndroid x64", |
"--config-file", |
- "[BUILDER_CACHE]/ClangToTAndroidASan/src/tools/mb/mb_config.pyl", |
- "//out/Debug" |
+ "[BUILDER_CACHE]/ClangToTAndroid_x64/src/tools/mb/mb_config.pyl", |
+ "//out/Release" |
], |
- "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan/src", |
+ "cwd": "[BUILDER_CACHE]/ClangToTAndroid_x64/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -247,14 +247,14 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", |
"--src-dir", |
- "[BUILDER_CACHE]/ClangToTAndroidASan/src", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x64/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_x64/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroid_x64/src/build/android:%(PATH)s" |
}, |
"name": "clang_revision", |
"~followup_annotations": [ |
@@ -277,30 +277,29 @@ |
"--ninja-path", |
"RECIPE_PACKAGE_REPO[depot_tools]/ninja", |
"--target", |
- "Debug", |
+ "Release", |
"--src-dir", |
- "[BUILDER_CACHE]/ClangToTAndroidASan/src", |
+ "[BUILDER_CACHE]/ClangToTAndroid_x64/src", |
"--goma-cache-dir", |
"[GOMA_CACHE]", |
"--buildbot-buildername", |
- "ClangToTAndroidASan", |
+ "ClangToTAndroid x64", |
"--buildbot-mastername", |
"chromium.fyi", |
"--buildbot-slavename", |
"TestSlavename", |
"--goma-deps-cache-file", |
- "ClangToTAndroidASan.gomadeps", |
+ "ClangToTAndroid_x64.gomadeps", |
"--build-data-dir", |
"[ROOT]/build_data_dir", |
"--compiler", |
"clang", |
- "--", |
- "all" |
+ "--" |
], |
"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_x64/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroid_x64/src/build/android:%(PATH)s" |
}, |
"name": "compile" |
}, |