| Index: scripts/slave/recipes/gpu.expected/linux_release_tryserver.json
|
| diff --git a/scripts/slave/recipes/gpu.expected/linux_release_tryserver.json b/scripts/slave/recipes/gpu.expected/linux_release_tryserver.json
|
| index d7d30fa707ace61e6634ad0d93ab3babde031463..8898cb5b7e02d2c375f326b2713250820e044455 100644
|
| --- a/scripts/slave/recipes/gpu.expected/linux_release_tryserver.json
|
| +++ b/scripts/slave/recipes/gpu.expected/linux_release_tryserver.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/LayoutTests': None, 'src/webkit/data/layout_tests/LayoutTests': None}, '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_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/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, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]"
|
| @@ -19,9 +19,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"
|
| },
|
| @@ -29,7 +29,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]/gclient.py",
|
| + "[DEPOT_TOOLS]/gclient.py",
|
| "sync",
|
| "--nohooks",
|
| "--output-json",
|
| @@ -72,9 +72,9 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]/apply_issue.py",
|
| + "[DEPOT_TOOLS]/apply_issue.py",
|
| "-r",
|
| - "[SLAVE_BUILD_ROOT]/src",
|
| + "[SLAVE_BUILD]/src",
|
| "-i",
|
| "12853011",
|
| "-p",
|
| @@ -89,7 +89,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]/gclient.py",
|
| + "[DEPOT_TOOLS]/gclient.py",
|
| "runhooks"
|
| ],
|
| "env": {
|
| @@ -103,13 +103,13 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]/scripts/slave/compile.py",
|
| + "[BUILD]/scripts/slave/compile.py",
|
| "--target",
|
| "Release",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]/src/out",
|
| + "[SLAVE_BUILD]/src/out",
|
| "--src-dir",
|
| - "[SLAVE_BUILD_ROOT]/src",
|
| + "[SLAVE_BUILD]/src",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -124,11 +124,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]/scripts/slave/runtest.py",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| "--target",
|
| "Release",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]/src/out",
|
| + "[SLAVE_BUILD]/src/out",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| @@ -143,11 +143,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]/scripts/slave/runtest.py",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| "--target",
|
| "Release",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]/src/out",
|
| + "[SLAVE_BUILD]/src/out",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| @@ -162,11 +162,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]/scripts/slave/runtest.py",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| "--target",
|
| "Release",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]/src/out",
|
| + "[SLAVE_BUILD]/src/out",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| @@ -182,11 +182,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]/scripts/slave/runtest.py",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| "--target",
|
| "Release",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]/src/out",
|
| + "[SLAVE_BUILD]/src/out",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| @@ -200,8 +200,8 @@
|
| "--builder-name=TestBuilder",
|
| "content_browsertests",
|
| "--use-gpu-in-tests",
|
| - "--generated-dir=[SLAVE_BUILD_ROOT]/content_gpu_data/generated",
|
| - "--reference-dir=[SLAVE_BUILD_ROOT]/content_gpu_data/reference",
|
| + "--generated-dir=[SLAVE_BUILD]/content_gpu_data/generated",
|
| + "--reference-dir=[SLAVE_BUILD]/content_gpu_data/reference",
|
| "--build-revision=HEAD",
|
| "--gtest_filter=WebGLConformanceTest.*:Gpu*.*",
|
| "--ui-test-action-max-timeout=45000",
|
| @@ -214,15 +214,15 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]/scripts/slave/chromium/archive_gpu_pixel_test_results.py",
|
| + "[BUILD]/scripts/slave/chromium/archive_gpu_pixel_test_results.py",
|
| "--run-id",
|
| "HEAD_TestBuilder",
|
| "--generated-dir",
|
| - "[SLAVE_BUILD_ROOT]/content_gpu_data/generated",
|
| + "[SLAVE_BUILD]/content_gpu_data/generated",
|
| "--gpu-reference-dir",
|
| - "[SLAVE_BUILD_ROOT]/content_gpu_data/reference",
|
| + "[SLAVE_BUILD]/content_gpu_data/reference",
|
| "--gsutil",
|
| - "[BUILD_ROOT]/scripts/slave/gsutil"
|
| + "[BUILD]/scripts/slave/gsutil"
|
| ],
|
| "name": "archive_test_results"
|
| },
|
| @@ -232,11 +232,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]/scripts/slave/runtest.py",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| "--target",
|
| "Release",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]/src/out",
|
| + "[SLAVE_BUILD]/src/out",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| @@ -258,11 +258,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD_ROOT]/scripts/slave/runtest.py",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| "--target",
|
| "Release",
|
| "--build-dir",
|
| - "[SLAVE_BUILD_ROOT]/src/out",
|
| + "[SLAVE_BUILD]/src/out",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"gpu\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
|
|