Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_v8_v8_android_chromium_gn_dbg.json |
diff --git a/scripts/slave/recipes/chromium_gn.expected/full_tryserver_v8_v8_android_chromium_gn_dbg.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_v8_v8_android_chromium_gn_dbg.json |
similarity index 84% |
rename from scripts/slave/recipes/chromium_gn.expected/full_tryserver_v8_v8_android_chromium_gn_dbg.json |
rename to scripts/slave/recipes/chromium_trybot.expected/full_tryserver_v8_v8_android_chromium_gn_dbg.json |
index 013c5d30501707bea0a459b83abecebbeb5b1827..53554c35e06a70e193050d585b642f7d2aecd548 100644 |
--- a/scripts/slave/recipes/chromium_gn.expected/full_tryserver_v8_v8_android_chromium_gn_dbg.json |
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_v8_v8_android_chromium_gn_dbg.json |
@@ -11,9 +11,9 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'v8_branch': 'branches/bleeding_edge', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'safesync_url': 'https://build.chromium.org/p/chromium/lkcr-status/lkgr', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'v8_branch': 'branches/bleeding_edge', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'safesync_url': 'https://build.chromium.org/p/chromium/lkcr-status/lkgr', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
"--root", |
- "src/v8", |
+ "src", |
"--revision_mapping_file", |
"{\"src\": \"got_cr_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_revision\"}", |
"--git-cache-dir", |
@@ -30,7 +30,6 @@ |
"src@origin/lkcr", |
"--revision", |
"src/v8@HEAD", |
- "--force", |
"--output_manifest" |
], |
"cwd": "[SLAVE_BUILD]", |
@@ -73,7 +72,7 @@ |
"@@@STEP_LOG_LINE@json.output@ }@@@", |
"@@@STEP_LOG_LINE@json.output@ }, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/v8\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@", |
@@ -110,37 +109,29 @@ |
"cmd": [ |
"python", |
"-u", |
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
- "runhooks" |
+ "RECIPE_MODULE[build::goma]/resources/ensure_goma.py", |
+ "--target-dir", |
+ "[SLAVE_BUILD]/src/build/goma/client", |
+ "--download-from-google-storage-path", |
+ "RECIPE_PACKAGE_REPO[depot_tools]/download_from_google_storage.py" |
], |
"cwd": "[SLAVE_BUILD]", |
- "env": { |
- "GYP_CHROMIUM_NO_ACTION": "1", |
- "GYP_CROSSCOMPILE": "1", |
- "GYP_DEFINES": "component=shared_library gomadir='[BUILD]/goma' target_arch=arm64 use_goma=1", |
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
- }, |
- "name": "gclient runhooks" |
+ "name": "ensure_goma" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[SLAVE_BUILD]/src/testing/buildbot/tryserver.v8.json", |
- "/path/to/tmp/json" |
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
+ "runhooks" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "read test spec", |
- "~followup_annotations": [ |
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/tryserver.v8.json@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"v8_android_chromium_gn_dbg\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": []@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
+ "env": { |
+ "GYP_CHROMIUM_NO_ACTION": "1", |
+ "GYP_DEFINES": "component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[SLAVE_BUILD]/src/build/goma/client' target_arch=x64 use_goma=1", |
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
+ }, |
+ "name": "gclient runhooks (with patch)" |
}, |
{ |
"cmd": [ |
@@ -155,7 +146,7 @@ |
"--paths", |
"{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", |
"--properties", |
- "{\"buildername\": \"v8_android_chromium_gn_dbg\", \"buildnumber\": 571, \"mastername\": \"tryserver.v8\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}" |
+ "{\"buildername\": \"v8_android_chromium_gn_dbg\", \"buildnumber\": 571, \"mastername\": \"tryserver.v8\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "get compile targets for scripts", |
@@ -166,6 +157,22 @@ |
}, |
{ |
"cmd": [ |
+ "python", |
+ "-u", |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "read test spec", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@", |
+ "@@@STEP_LOG_LINE@json.output@{}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
"git", |
"diff", |
"--cached", |
@@ -176,7 +183,8 @@ |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@files@foo.cc@@@", |
- "@@@STEP_LOG_END@files@@@" |
+ "@@@STEP_LOG_END@files@@@", |
+ "@@@SET_BUILD_PROPERTY@subproject_tag@\"chromium\"@@@" |
] |
}, |
{ |
@@ -193,13 +201,12 @@ |
"@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
"@@@STEP_LOG_LINE@json.output@ \"base\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"exclusions\": [@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"f.*\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ ]@@@", |
"@@@STEP_LOG_LINE@json.output@ }, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"chromium\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"ios\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@", |
"@@@STEP_LOG_LINE@json.output@ }@@@", |
"@@@STEP_LOG_LINE@json.output@}@@@", |
"@@@STEP_LOG_END@json.output@@@" |
@@ -209,30 +216,15 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/tools/mb/mb.py", |
- "analyze", |
- "-m", |
- "tryserver.v8", |
- "-b", |
- "v8_android_chromium_gn_dbg", |
- "-v", |
- "//out/Debug", |
- "{\"additional_compile_targets\": [\"chrome_public_apk\"], \"files\": [\"foo.cc\"], \"test_targets\": []}", |
- "/path/to/tmp/json" |
+ "import sys; sys.exit(0)" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "analyze", |
"~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"compile_targets\": [], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"status\": \"Found dependency\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"test_targets\": []@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@", |
+ "@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@", |
+ "@@@STEP_LOG_END@excluded_files@@@", |
"@@@STEP_LOG_LINE@analyze_details@{@@@", |
- "@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [@@@", |
- "@@@STEP_LOG_LINE@analyze_details@ \"chrome_public_apk\"@@@", |
- "@@@STEP_LOG_LINE@analyze_details@ ], @@@", |
+ "@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [], @@@", |
"@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [], @@@", |
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [], @@@", |
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [], @@@", |
@@ -242,6 +234,15 @@ |
] |
}, |
{ |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "import sys; sys.exit(0)" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "mark: before_tests" |
+ }, |
+ { |
"name": "$result", |
"recipe_result": null, |
"status_code": 0 |