| Index: scripts/slave/recipes/blink_trybot.expected/full_tryserver_v8_v8_linux_layout_dbg_fail.json
|
| diff --git a/scripts/slave/recipes/blink_trybot.expected/full_tryserver_v8_v8_linux_layout_dbg_fail.json b/scripts/slave/recipes/blink_trybot.expected/full_tryserver_v8_v8_linux_layout_dbg_fail.json
|
| index f6deecf3d3cadff3c88fec13d21a023e5957780c..ab7df63cf49d870a4d589bf0041b54d1e2823cb4 100644
|
| --- a/scripts/slave/recipes/blink_trybot.expected/full_tryserver_v8_v8_linux_layout_dbg_fail.json
|
| +++ b/scripts/slave/recipes/blink_trybot.expected/full_tryserver_v8_v8_linux_layout_dbg_fail.json
|
| @@ -25,83 +25,31 @@
|
| "--revision",
|
| "src@HEAD",
|
| "--revision",
|
| - "src/v8@HEAD"
|
| - ],
|
| - "name": "bot_update",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"did_run\": false@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[DEPOT_TOOLS]/gclient.py",
|
| - "config",
|
| - "--spec",
|
| - "cache_dir = None\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', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'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}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]"
|
| - ],
|
| - "name": "gclient setup"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/gclient_safe_revert.py",
|
| - ".",
|
| - "[DEPOT_TOOLS]/gclient"
|
| - ],
|
| - "name": "gclient revert"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[DEPOT_TOOLS]/gclient.py",
|
| - "sync",
|
| - "--nohooks",
|
| - "--delete_unversioned_trees",
|
| - "--force",
|
| - "--verbose",
|
| - "--revision",
|
| - "src@HEAD",
|
| - "--revision",
|
| "src/v8@HEAD",
|
| - "--output-json",
|
| - "/path/to/tmp/json"
|
| + "--force"
|
| ],
|
| - "name": "gclient sync",
|
| + "name": "bot_update",
|
| "~followup_annotations": [
|
| + "@@@STEP_TEXT@Some step text@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src-internal/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 274229@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/native_client/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 274981@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/third_party/WebKit/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 124383@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 120644@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarm_client/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 200767@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 276089@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/v8/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 43426@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/third_party/WebKit\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": 274981, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_git\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": 43426, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_revision_git\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_swarm_client_revision\": 200767, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_swarm_client_revision_git\": \"932d037f462c12db1f3210de8ea1b2964f363f47\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": 276089, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_git\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision\": 124383, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision_git\": \"5e2293dffc3cd07d37fbedea3b500f0eb650614d\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": 120644, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_git\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",
|
| @@ -109,30 +57,19 @@
|
| "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
|
| "@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",
|
| "@@@SET_BUILD_PROPERTY@got_revision@43426@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarm_client_revision@200767@@@"
|
| + "@@@SET_BUILD_PROPERTY@got_swarm_client_revision_git@\"932d037f462c12db1f3210de8ea1b2964f363f47\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_nacl_revision_git@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_webkit_revision_git@\"5e2293dffc3cd07d37fbedea3b500f0eb650614d\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_webrtc_revision_git@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_swarm_client_revision@200767@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_git@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_revision_git@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@"
|
| ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS]/apply_issue.py",
|
| - "-r",
|
| - "[SLAVE_BUILD]/src/v8",
|
| - "-i",
|
| - "12853011",
|
| - "-p",
|
| - "1",
|
| - "-s",
|
| - "https://codereview.chromium.org",
|
| - "--no-auth"
|
| - ],
|
| - "name": "apply_issue"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "[DEPOT_TOOLS]/gclient.py",
|
| "runhooks"
|
| ],
|
| @@ -324,77 +261,32 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS]/gclient.py",
|
| - "config",
|
| + "[BUILD]/scripts/slave/bot_update.py",
|
| + "--master",
|
| + "tryserver.v8",
|
| + "--builder",
|
| + "v8_linux_layout_dbg",
|
| + "--slave",
|
| + "TestSlavename",
|
| "--spec",
|
| - "cache_dir = None\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', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'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}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]"
|
| - ],
|
| - "name": "gclient setup (2)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/gclient_safe_revert.py",
|
| - ".",
|
| - "[DEPOT_TOOLS]/gclient"
|
| - ],
|
| - "name": "gclient revert (2)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[DEPOT_TOOLS]/gclient.py",
|
| - "sync",
|
| - "--nohooks",
|
| - "--delete_unversioned_trees",
|
| - "--force",
|
| - "--verbose",
|
| + "cache_dir = None\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', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'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}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]",
|
| + "--root",
|
| + "src/third_party/WebKit",
|
| + "--revision_mapping_file",
|
| + "{\"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarm_client\": \"got_swarm_client_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_revision\"}",
|
| + "--output_json",
|
| + "/path/to/tmp/json",
|
| "--revision",
|
| "src@HEAD",
|
| "--revision",
|
| - "src/v8@HEAD",
|
| - "--output-json",
|
| - "/path/to/tmp/json"
|
| + "src/v8@HEAD"
|
| ],
|
| - "name": "gclient sync (2)",
|
| + "name": "bot_update (without patch)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src-internal/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 274229@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/native_client/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 274981@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/third_party/WebKit/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 124383@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 120644@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarm_client/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 200767@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 276089@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/v8/\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": 43426@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"did_run\": false@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision@43426@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarm_client_revision@200767@@@"
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| {
|
|
|