| Index: scripts/slave/recipes/gpu.expected/win_debug.json
|
| diff --git a/scripts/slave/recipes/gpu.expected/win_debug.json b/scripts/slave/recipes/gpu.expected/win_debug.json
|
| index cc85ff95bab15172cb8aa3c8022ad71738f97b5e..b2eb7c70a23962b1b45bcc9e125a01f5d9514cde 100644
|
| --- a/scripts/slave/recipes/gpu.expected/win_debug.json
|
| +++ b/scripts/slave/recipes/gpu.expected/win_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/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.bat"
|
| + "[DEPOT_TOOLS]\\gclient.bat"
|
| ],
|
| "name": "gclient revert"
|
| },
|
| @@ -29,7 +29,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]\\gclient.py",
|
| + "[DEPOT_TOOLS]\\gclient.py",
|
| "sync",
|
| "--nohooks",
|
| "--output-json",
|
| @@ -72,7 +72,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS_ROOT]\\gclient.py",
|
| + "[DEPOT_TOOLS]\\gclient.py",
|
| "runhooks"
|
| ],
|
| "env": {
|
| @@ -87,13 +87,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",
|
| @@ -108,11 +108,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",
|
| "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| @@ -127,11 +127,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",
|
| "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| @@ -146,11 +146,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",
|
| "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| @@ -166,11 +166,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",
|
| "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"\", \"recipe\": \"gpu\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| @@ -184,8 +184,8 @@
|
| "--builder-name=TestBuilder",
|
| "content_browsertests.exe",
|
| "--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=204787",
|
| "--gtest_filter=WebGLConformanceTest.*:Gpu*.*",
|
| "--ui-test-action-max-timeout=45000",
|
| @@ -198,15 +198,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",
|
| "204787_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.bat"
|
| + "[BUILD]\\scripts\\slave\\gsutil.bat"
|
| ],
|
| "name": "archive_test_results"
|
| }
|
|
|