| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClngLLDdbg.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClngLLDdbg.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClngLLDdbg.json
|
| index a5bf78b987b3b1e10892d61f9180bd101ee75613..1c75ae7d64ac85ee1a000d81bca3593f2b1928e5 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClngLLDdbg.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CrWinClngLLDdbg.json
|
| @@ -5,7 +5,6 @@
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "taskkill"
|
| },
|
| {
|
| @@ -20,13 +19,13 @@
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'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'}]",
|
| + "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'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'}]",
|
| "--root",
|
| "src",
|
| "--revision_mapping_file",
|
| "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| "--git-cache-dir",
|
| - "[GIT_CACHE]",
|
| + "[ROOT]\\b\\build\\slave\\cache_dir",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| @@ -34,7 +33,6 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -110,10 +108,9 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
|
| + "[CWD]\\src\\tools\\swarming_client\\swarming.py",
|
| "--version"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "swarming.py --version",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -127,7 +124,6 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "GYP_DEFINES": "clang=1 component=shared_library fastbuild=1 target_arch=ia32 test_isolation_mode=prepare use_lld=1",
|
| @@ -140,18 +136,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
|
| + "[CWD]\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Debug",
|
| "--paths",
|
| - "{\"checkout\": \"[SLAVE_BUILD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| + "{\"checkout\": \"[CWD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"CrWinClngLLDdbg\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| @@ -163,13 +158,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json",
|
| + "[CWD]\\src\\testing\\buildbot\\chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json@@@",
|
| + "@@@STEP_TEXT@path: [CWD]\\src\\testing\\buildbot\\chromium.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"CrWinClngLLDdbg tester\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| @@ -194,7 +188,6 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -203,10 +196,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",
|
| "--build-dir",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug",
|
| + "[CWD]\\src\\out\\Debug",
|
| "--clean-isolated-files"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "clean isolated files"
|
| },
|
| {
|
| @@ -216,11 +208,10 @@
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\clang_revision.py",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]\\src",
|
| + "[CWD]\\src",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "LLVM_FORCE_HEAD_REVISION": "YES"
|
| @@ -248,9 +239,9 @@
|
| "--target",
|
| "Debug",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]\\src",
|
| + "[CWD]\\src",
|
| "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| + "[ROOT]\\b\\build\\slave\\goma_cache",
|
| "--build-tool",
|
| "ninja",
|
| "--build-data-dir",
|
| @@ -260,7 +251,6 @@
|
| "--",
|
| "all"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "LLVM_FORCE_HEAD_REVISION": "YES"
|
| @@ -273,11 +263,11 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]\\resources\\remove_build_metadata.py",
|
| "--build-dir",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug",
|
| + "[CWD]\\src\\out\\Debug",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]\\src"
|
| + "[CWD]\\src"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| + "cwd": "[CWD]",
|
| "name": "remove_build_metadata"
|
| },
|
| {
|
| @@ -285,16 +275,15 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]\\resources\\isolate.py",
|
| - "[SLAVE_BUILD]\\src\\tools\\swarming_client",
|
| + "[CWD]\\src\\tools\\swarming_client",
|
| "batcharchive",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[SLAVE_BUILD]\\src\\out\\Debug\\browser_tests.isolated.gen.json"
|
| + "[CWD]\\src\\out\\Debug\\browser_tests.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -323,12 +312,10 @@
|
| "--build-properties",
|
| "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"CrWinClngLLDdbg\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "package build"
|
| },
|
| {
|
| "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "trigger",
|
| "trigger_specs": [
|
| {
|
|
|