| Index: scripts/slave/recipes/chromium.expected/full_chromium_lkgr_Mac_ASAN_Release_Media.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_lkgr_UBSan_Release.json b/scripts/slave/recipes/chromium.expected/full_chromium_lkgr_Mac_ASAN_Release_Media.json
|
| similarity index 95%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_lkgr_UBSan_Release.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_lkgr_Mac_ASAN_Release_Media.json
|
| index b22cf422905a71ea68c8a4fd4c4a17663d2e14de..934c8f05aeec6a0208104964d116d580caa7a873 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_lkgr_UBSan_Release.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_lkgr_Mac_ASAN_Release_Media.json
|
| @@ -7,7 +7,7 @@
|
| "--master",
|
| "chromium.lkgr",
|
| "--builder",
|
| - "UBSan Release",
|
| + "Mac ASAN Release Media",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -114,7 +114,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
|
| "--platform",
|
| - "linux-amd64",
|
| + "mac-amd64",
|
| "--dest-directory",
|
| "[SLAVE_BUILD]/cipd",
|
| "--json-output",
|
| @@ -138,7 +138,7 @@
|
| "--root",
|
| "[CACHE]/cipd/goma",
|
| "--list",
|
| - "infra_internal/goma/client/linux-amd64 release",
|
| + "infra_internal/goma/client/mac-amd64 release",
|
| "--json-output",
|
| "/path/to/tmp/json",
|
| "--service-account-json",
|
| @@ -151,7 +151,7 @@
|
| "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
|
| "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/mac-amd64\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| @@ -188,7 +188,7 @@
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "clang=1 component=static_library gomadir='[CACHE]/cipd/goma' release_extra_cflags=-fno-sanitize-recover=undefined sanitizer_coverage=edge target_arch=x64 ubsan=1 use_goma=1",
|
| + "GYP_DEFINES": "asan=1 clang=1 component=static_library enable_ipc_fuzzer=1 fastbuild=0 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' host_arch=x64 proprietary_codecs=1 target_arch=x64 use_goma=1 v8_enable_verify_heap=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -213,7 +213,7 @@
|
| "-m",
|
| "chromium.lkgr",
|
| "-b",
|
| - "UBSan Release",
|
| + "Mac ASAN Release Media",
|
| "--config-file",
|
| "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| @@ -318,7 +318,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::archive]/resources/zip_archive.py",
|
| "[TMP_BASE]/chrome_staging_tmp_1",
|
| - "ubsan-linux-release-170242",
|
| + "asan-mac-release-170242",
|
| "[\"file 1\", \"file 2\"]",
|
| "[SLAVE_BUILD]/src/out/Release"
|
| ],
|
| @@ -339,12 +339,12 @@
|
| "cp",
|
| "-a",
|
| "public-read",
|
| - "[TMP_BASE]/chrome_staging_tmp_1/ubsan-linux-release-170242.zip",
|
| - "gs://chromium-browser-ubsan/linux-release/ubsan-linux-release-170242.zip"
|
| + "[TMP_BASE]/chrome_staging_tmp_1/asan-mac-release-170242.zip",
|
| + "gs://chrome-test-builds/media/mac-release/asan-mac-release-170242.zip"
|
| ],
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| - "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-browser-ubsan/linux-release/ubsan-linux-release-170242.zip@@@"
|
| + "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chrome-test-builds/media/mac-release/asan-mac-release-170242.zip@@@"
|
| ]
|
| },
|
| {
|
| @@ -352,9 +352,9 @@
|
| "python",
|
| "-u",
|
| "\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
|
| - "[TMP_BASE]/chrome_staging_tmp_1/ubsan-linux-release-170242.zip"
|
| + "[TMP_BASE]/chrome_staging_tmp_1/asan-mac-release-170242.zip"
|
| ],
|
| - "name": "ubsan-linux-release-170242.zip",
|
| + "name": "asan-mac-release-170242.zip",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| "@@@STEP_LOG_LINE@python.inline@import os@@@",
|
|
|