| Index: scripts/slave/recipes/blink_trybot.expected/mac_success_debug.json
|
| diff --git a/scripts/slave/recipes/blink_trybot.expected/mac_success_debug.json b/scripts/slave/recipes/blink_trybot.expected/mac_success_debug.json
|
| index 02feb99f1108159511d0977d9bd73dc5e7af766f..d533a0966eecc2ad7f5f797e6a01b4a25a684401 100644
|
| --- a/scripts/slave/recipes/blink_trybot.expected/mac_success_debug.json
|
| +++ b/scripts/slave/recipes/blink_trybot.expected/mac_success_debug.json
|
| @@ -3,7 +3,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]/gclient.py",
|
| + "[DEPOT_TOOLS]/gclient.py",
|
| "config",
|
| "--spec",
|
| "cache_dir = None\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', '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'}]"
|
| @@ -27,9 +27,9 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]/scripts/slave/gclient_safe_revert.py",
|
| + "[BUILD]/scripts/slave/gclient_safe_revert.py",
|
| ".",
|
| - "[DEPOT_TOOLS_ROOT]/gclient"
|
| + "[DEPOT_TOOLS]/gclient"
|
| ],
|
| "name": "gclient revert"
|
| },
|
| @@ -37,7 +37,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]/gclient.py",
|
| + "[DEPOT_TOOLS]/gclient.py",
|
| "sync",
|
| "--nohooks",
|
| "--output-json",
|
| @@ -80,9 +80,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",
|
| @@ -97,7 +97,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]/gclient.py",
|
| + "[DEPOT_TOOLS]/gclient.py",
|
| "runhooks"
|
| ],
|
| "env": {
|
| @@ -111,13 +111,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",
|
| @@ -131,9 +131,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"
|
| ],
|
| @@ -143,9 +143,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"
|
| ],
|
| @@ -156,11 +156,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\": false, \"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\"}",
|
| @@ -175,11 +175,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\": false, \"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\"}",
|
| @@ -194,11 +194,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\": false, \"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\"}",
|
| @@ -214,24 +214,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\": false, \"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\": false, \"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"
|
| ],
|
| @@ -274,11 +274,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",
|
|
|