Index: scripts/slave/recipes/blink_trybot.expected/win_success_debug.json |
diff --git a/scripts/slave/recipes/blink_trybot.expected/win_success_debug.json b/scripts/slave/recipes/blink_trybot.expected/win_success_debug.json |
index 272184e0b480c1ccf44947aa58a98353dbf962d6..18b884718488697912a483948232ba0d808a2252 100644 |
--- a/scripts/slave/recipes/blink_trybot.expected/win_success_debug.json |
+++ b/scripts/slave/recipes/blink_trybot.expected/win_success_debug.json |
@@ -1,24 +1,20 @@ |
[ |
{ |
- "cmd": ["[DEPOT_TOOLS_ROOT]\\gclient.bat", "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.bat"], |
- "name": "gclient revert" |
- }, |
- { |
- "cmd": ["[DEPOT_TOOLS_ROOT]\\gclient.bat", "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.bat", "runhooks"], |
- "env": {"GYP_DEFINES": "chromium_win_pch=0 component=shared_library dcheck_always_on=1 fastbuild=1", "GYP_GENERATORS": "ninja", "GYP_GENERATOR_FLAGS": "", "GYP_MSVS_VERSION": ""}, |
+ "env": {"GYP_DEFINES": "chromium_win_pch=0 component=shared_library dcheck_always_on=1 fastbuild=1", "GYP_GENERATORS": "ninja", "GYP_GENERATOR_FLAGS": "", "GYP_MSVS_VERSION": null}, |
"name": "gclient runhooks" |
}, |
{ |
@@ -26,11 +22,11 @@ |
"name": "compile" |
}, |
{ |
- "cmd": ["python", "[BUILD_ROOT]\\scripts\\slave\\runtest.py", "--target", "Debug", "--build-dir", "[SLAVE_BUILD_ROOT]\\src\\out", "--no-xvfb", "--factory-properties", "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"config_name\": \"blink\", \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://chromiumcodereview.appspot.com\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", "--build-properties", "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"config_name\": \"blink\", \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://chromiumcodereview.appspot.com\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", "webkit_unit_tests"], |
+ "cmd": ["python", "[BUILD_ROOT]\\scripts\\slave\\runtest.py", "--target", "Debug", "--build-dir", "[SLAVE_BUILD_ROOT]\\src\\out", "--no-xvfb", "--factory-properties", "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"config_name\": \"blink\", \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://chromiumcodereview.appspot.com\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", "--build-properties", "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"config_name\": \"blink\", \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://chromiumcodereview.appspot.com\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", "webkit_unit_tests.exe"], |
"name": "webkit_unit_tests" |
}, |
{ |
- "cmd": ["python", "[BUILD_ROOT]\\scripts\\slave\\chromium\\lint_test_files_wrapper.py", "--build-dir", "[SLAVE_BUILD_ROOT]\\src\\out", "--target", "Debug"], |
+ "cmd": ["python", "-u", "[BUILD_ROOT]\\scripts\\slave\\chromium\\lint_test_files_wrapper.py", "--build-dir", "[SLAVE_BUILD_ROOT]\\src\\out", "--target", "Debug"], |
"name": "webkit_lint" |
}, |
{ |
@@ -39,7 +35,7 @@ |
"name": "webkit_tests (with patch)" |
}, |
{ |
- "cmd": ["python", "-c", "print \"ALL IS WELL\""], |
+ "cmd": ["python", "-u", "print \"ALL IS WELL\""], |
"name": "webkit_tests" |
} |
] |