| Index: scripts/slave/recipes/blink_trybot.expected/linux_fail_release.json
|
| diff --git a/scripts/slave/recipes/blink_trybot.expected/linux_fail_release.json b/scripts/slave/recipes/blink_trybot.expected/linux_fail_release.json
|
| index fb90e1915c018e2fece85b3a1aec575dcabf5529..eade03064cc2fb42995d80c288e01aff85e73e1f 100644
|
| --- a/scripts/slave/recipes/blink_trybot.expected/linux_fail_release.json
|
| +++ b/scripts/slave/recipes/blink_trybot.expected/linux_fail_release.json
|
| @@ -1,24 +1,20 @@
|
| [
|
| {
|
| - "cmd": ["[DEPOT_TOOLS_ROOT]/gclient", "config", "--spec", "deps_os = {}\nhooks = []\nsolutions = [{'custom_deps': {'src/third_party/WebKit': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, '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', 'webkit_revision': 'HEAD', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'safesync_url': None, 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = []\ntarget_os_only = False"],
|
| + "cmd": ["python", "-u", "[DEPOT_TOOLS_ROOT]/gclient.py", "config", "--spec", "deps_os = {}\nhooks = []\nsolutions = [{'custom_deps': {'src/third_party/WebKit': 'https://chromium.googlesource.com/chromium/blink.git'}, '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', 'webkit_revision': 'HEAD', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'safesync_url': None, 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = []\ntarget_os_only = False"],
|
| "name": "gclient setup",
|
| - "seed_steps": ["gclient setup", "gclient revert", "gclient sync", "apply_issue", "gclient runhooks", "compile", "webkit_unit_tests", "webkit_lint"]
|
| + "seed_steps": ["gclient setup", "gclient sync", "apply_issue", "gclient runhooks", "compile", "webkit_unit_tests", "webkit_lint"]
|
| },
|
| {
|
| - "cmd": ["python", "[BUILD_ROOT]/scripts/slave/gclient_safe_revert.py", ".", "[DEPOT_TOOLS_ROOT]/gclient"],
|
| - "name": "gclient revert"
|
| - },
|
| - {
|
| - "cmd": ["[DEPOT_TOOLS_ROOT]/gclient", "sync", "--nohooks"],
|
| + "cmd": ["python", "-u", "[DEPOT_TOOLS_ROOT]/gclient.py", "sync", "--verbose", "--with_branch_heads", "--nohooks", "--reset", "--delete_unversioned_trees", "--force"],
|
| "name": "gclient sync"
|
| },
|
| {
|
| - "cmd": ["[DEPOT_TOOLS_ROOT]/apply_issue", "-r", "[SLAVE_BUILD_ROOT]/src/third_party/WebKit", "-i", 12853011, "-p", 1, "-s", "https://chromiumcodereview.appspot.com", "-e", "commit-bot@chromium.org"],
|
| + "cmd": ["python", "-u", "[DEPOT_TOOLS_ROOT]/apply_issue.py", "-r", "[SLAVE_BUILD_ROOT]/src/third_party/WebKit", "-i", 12853011, "-p", 1, "-s", "https://chromiumcodereview.appspot.com", "-e", "commit-bot@chromium.org", "--no-commit"],
|
| "name": "apply_issue"
|
| },
|
| {
|
| "cmd": ["[DEPOT_TOOLS_ROOT]/gclient", "runhooks"],
|
| - "env": {"GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1", "GYP_GENERATORS": "ninja", "GYP_GENERATOR_FLAGS": "", "GYP_MSVS_VERSION": ""},
|
| + "env": {"GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1", "GYP_GENERATORS": "ninja", "GYP_GENERATOR_FLAGS": "", "GYP_MSVS_VERSION": null},
|
| "name": "gclient runhooks"
|
| },
|
| {
|
| @@ -30,7 +26,7 @@
|
| "name": "webkit_unit_tests"
|
| },
|
| {
|
| - "cmd": ["python", "[BUILD_ROOT]/scripts/slave/chromium/lint_test_files_wrapper.py", "--build-dir", "[SLAVE_BUILD_ROOT]/src/out", "--target", "Release"],
|
| + "cmd": ["python", "-u", "[BUILD_ROOT]/scripts/slave/chromium/lint_test_files_wrapper.py", "--build-dir", "[SLAVE_BUILD_ROOT]/src/out", "--target", "Release"],
|
| "name": "webkit_lint"
|
| },
|
| {
|
| @@ -39,13 +35,13 @@
|
| "name": "webkit_tests (with patch)"
|
| },
|
| {
|
| - "cmd": ["python", "[BUILD_ROOT]/scripts/slave/gclient_safe_revert.py", ".", "[DEPOT_TOOLS_ROOT]/gclient"],
|
| - "name": "gclient revert (2)",
|
| - "seed_steps": ["gclient revert (2)", "gclient runhooks (2)", "compile (2)", "webkit_tests (without patch)"]
|
| + "cmd": ["python", "-u", "[BUILD_ROOT]/scripts/slave/gclient_safe_revert.py", ".", "[DEPOT_TOOLS_ROOT]/gclient"],
|
| + "name": "gclient revert",
|
| + "seed_steps": ["gclient revert", "gclient runhooks (2)", "compile (2)", "webkit_tests (without patch)"]
|
| },
|
| {
|
| "cmd": ["[DEPOT_TOOLS_ROOT]/gclient", "runhooks"],
|
| - "env": {"GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1", "GYP_GENERATORS": "ninja", "GYP_GENERATOR_FLAGS": "", "GYP_MSVS_VERSION": ""},
|
| + "env": {"GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1", "GYP_GENERATORS": "ninja", "GYP_GENERATOR_FLAGS": "", "GYP_MSVS_VERSION": null},
|
| "name": "gclient runhooks (2)"
|
| },
|
| {
|
| @@ -58,7 +54,7 @@
|
| "name": "webkit_tests (without patch)"
|
| },
|
| {
|
| - "cmd": ["python", "[SLAVE_BUILD_ROOT]/src/third_party/WebKit/Tools/Scripts/print-json-test-results", "--ignored-failures-path", "{\"crazy\": [\"data\", \"format\"]}", "{\"crazy\": [\"data\", \"format\"]}"],
|
| + "cmd": ["python", "-u", "[SLAVE_BUILD_ROOT]/src/third_party/WebKit/Tools/Scripts/print-json-test-results", "--ignored-failures-path", "{\"crazy\": [\"data\", \"format\"]}", "{\"crazy\": [\"data\", \"format\"]}"],
|
| "name": "webkit_tests"
|
| }
|
| ]
|
|
|