| Index: scripts/slave/recipes/blink_trybot.expected/win_success_debug_git.json
|
| diff --git a/scripts/slave/recipes/blink_trybot.expected/win_success_debug_git.json b/scripts/slave/recipes/blink_trybot.expected/win_success_debug_git.json
|
| index 4342522e16102a3792fbc5a39283bd2204846f30..87fcc4f0cedf3c8e5b9cb1fca18f4f22e4177682 100644
|
| --- a/scripts/slave/recipes/blink_trybot.expected/win_success_debug_git.json
|
| +++ b/scripts/slave/recipes/blink_trybot.expected/win_success_debug_git.json
|
| @@ -3,7 +3,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]\\gclient.py",
|
| + "[DEPOT_TOOLS]\\gclient.py",
|
| "config",
|
| "--spec",
|
| "cache_dir = '[ROOT]\\\\git_cache'\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', '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}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]"
|
| @@ -28,7 +28,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]\\gclient.py",
|
| + "[DEPOT_TOOLS]\\gclient.py",
|
| "sync",
|
| "--verbose",
|
| "--with_branch_heads",
|
| @@ -79,7 +79,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]\\gclient.py",
|
| + "[DEPOT_TOOLS]\\gclient.py",
|
| "recurse",
|
| "git",
|
| "config",
|
| @@ -92,7 +92,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]\\gclient.py",
|
| + "[DEPOT_TOOLS]\\gclient.py",
|
| "recurse",
|
| "git",
|
| "config",
|
| @@ -105,9 +105,9 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]\\apply_issue.py",
|
| + "[DEPOT_TOOLS]\\apply_issue.py",
|
| "-r",
|
| - "[SLAVE_BUILD_ROOT]\\src\\third_party\\WebKit",
|
| + "[SLAVE_BUILD]\\src\\third_party\\WebKit",
|
| "-i",
|
| "12853011",
|
| "-p",
|
| @@ -122,7 +122,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]\\gclient.py",
|
| + "[DEPOT_TOOLS]\\gclient.py",
|
| "runhooks"
|
| ],
|
| "env": {
|
| @@ -137,13 +137,13 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]\\scripts\\slave\\compile.py",
|
| + "[BUILD]\\scripts\\slave\\compile.py",
|
| "--target",
|
| "Debug",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]\\src\\out",
|
| + "[SLAVE_BUILD]\\src\\out",
|
| "--src-dir",
|
| - "[SLAVE_BUILD_ROOT]\\src",
|
| + "[SLAVE_BUILD]\\src",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -157,9 +157,9 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]\\scripts\\slave\\chromium\\lint_test_files_wrapper.py",
|
| + "[BUILD]\\scripts\\slave\\chromium\\lint_test_files_wrapper.py",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]\\src\\out",
|
| + "[SLAVE_BUILD]\\src\\out",
|
| "--target",
|
| "Debug"
|
| ],
|
| @@ -169,9 +169,9 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]\\scripts\\slave\\chromium\\test_webkitpy_wrapper.py",
|
| + "[BUILD]\\scripts\\slave\\chromium\\test_webkitpy_wrapper.py",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]\\src\\out",
|
| + "[SLAVE_BUILD]\\src\\out",
|
| "--target",
|
| "Debug"
|
| ],
|
| @@ -182,11 +182,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]\\scripts\\slave\\runtest.py",
|
| + "[BUILD]\\scripts\\slave\\runtest.py",
|
| "--target",
|
| "Debug",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]\\src\\out",
|
| + "[SLAVE_BUILD]\\src\\out",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| "{\"GIT_MODE\": true, \"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://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| @@ -201,11 +201,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]\\scripts\\slave\\runtest.py",
|
| + "[BUILD]\\scripts\\slave\\runtest.py",
|
| "--target",
|
| "Debug",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]\\src\\out",
|
| + "[SLAVE_BUILD]\\src\\out",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| "{\"GIT_MODE\": true, \"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://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| @@ -220,11 +220,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]\\scripts\\slave\\runtest.py",
|
| + "[BUILD]\\scripts\\slave\\runtest.py",
|
| "--target",
|
| "Debug",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]\\src\\out",
|
| + "[SLAVE_BUILD]\\src\\out",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| "{\"GIT_MODE\": true, \"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://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| @@ -240,24 +240,24 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]\\scripts\\slave\\runtest.py",
|
| + "[BUILD]\\scripts\\slave\\runtest.py",
|
| "--target",
|
| "Debug",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]\\src\\out",
|
| + "[SLAVE_BUILD]\\src\\out",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| "{\"GIT_MODE\": true, \"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://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| "{\"GIT_MODE\": true, \"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://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--run-python-script",
|
| - "[BUILD_ROOT]\\scripts\\slave\\chromium\\layout_test_wrapper.py",
|
| + "[BUILD]\\scripts\\slave\\chromium\\layout_test_wrapper.py",
|
| "--target",
|
| "Debug",
|
| "-o",
|
| - "[SLAVE_BUILD_ROOT]\\layout-test-results",
|
| + "[SLAVE_BUILD]\\layout-test-results",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]\\src\\out",
|
| + "[SLAVE_BUILD]\\src\\out",
|
| "--json-test-results",
|
| "/path/to/tmp/json"
|
| ],
|
| @@ -300,11 +300,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]\\scripts\\slave\\chromium\\archive_layout_test_results.py",
|
| + "[BUILD]\\scripts\\slave\\chromium\\archive_layout_test_results.py",
|
| "--results-dir",
|
| - "[SLAVE_BUILD_ROOT]\\layout-test-results",
|
| + "[SLAVE_BUILD]\\layout-test-results",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]\\src\\out",
|
| + "[SLAVE_BUILD]\\src\\out",
|
| "--build-number",
|
| "571",
|
| "--builder-name",
|
|
|