| Index: scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_GPU_ASAN_Release.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_GPU_ASAN_Release.json b/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_GPU_ASAN_Release.json
|
| index 6576000160b489863d97d38cd9cf8507a507206c..8a1a91a97038606ff0e828f7b6df1aa697e9374f 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_GPU_ASAN_Release.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_GPU_ASAN_Release.json
|
| @@ -27,7 +27,7 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
|
| + "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
|
| "--patch_root",
|
| "src",
|
| "--revision_mapping_file",
|
| @@ -38,6 +38,8 @@
|
| "/path/to/tmp/json",
|
| "--revision",
|
| "src@HEAD",
|
| + "--revision",
|
| + "src/third_party/angle@HEAD",
|
| "--output_manifest"
|
| ],
|
| "cwd": "[BUILDER_CACHE]/Mac_GPU_ASAN_Release",
|
| @@ -50,7 +52,8 @@
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": \"HEAD\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
|
| @@ -201,6 +204,7 @@
|
| "cwd": "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src",
|
| "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' target_arch=x64 test_isolation_mode=prepare use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -277,6 +281,34 @@
|
| "name": "clean isolated files"
|
| },
|
| {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src/tools/mb/mb.py",
|
| + "gen",
|
| + "-m",
|
| + "chromium.gpu.fyi",
|
| + "-b",
|
| + "Mac GPU ASAN Release",
|
| + "--config-file",
|
| + "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src/tools/mb/mb_config.pyl",
|
| + "--goma-dir",
|
| + "[CACHE]/cipd/goma",
|
| + "--swarming-targets-file",
|
| + "browser_tests\n",
|
| + "//out/Release"
|
| + ],
|
| + "cwd": "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src",
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| + "name": "generate_build_files",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@swarming-targets-file.txt@browser_tests@@@",
|
| + "@@@STEP_LOG_END@swarming-targets-file.txt@@@"
|
| + ]
|
| + },
|
| + {
|
| "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
|
|