| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win8_chromium_gn_dbg.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win8_chromium_gn_dbg.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win8_chromium_gn_dbg.json
|
| index 46b21747011dcb9b0a5de324116608ae54c998b0..c795bc5d877242aba1a611217bf3ea721eca69b5 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win8_chromium_gn_dbg.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win8_chromium_gn_dbg.json
|
| @@ -5,6 +5,7 @@
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "taskkill"
|
| },
|
| {
|
| @@ -19,13 +20,13 @@
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| - "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'}]",
|
| + "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'}]",
|
| "--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",
|
| - "[ROOT]\\b\\build\\slave\\cache_dir",
|
| + "[GIT_CACHE]",
|
| "--issue",
|
| "12853011",
|
| "--patchset",
|
| @@ -38,6 +39,7 @@
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -111,6 +113,7 @@
|
| },
|
| {
|
| "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma"
|
| },
|
| {
|
| @@ -121,16 +124,17 @@
|
| "--platform",
|
| "windows-386",
|
| "--dest-directory",
|
| - "[CWD]\\cipd",
|
| + "[SLAVE_BUILD]\\cipd",
|
| "--json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma.install cipd",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"fake_slave_build/cipd\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| @@ -138,10 +142,10 @@
|
| },
|
| {
|
| "cmd": [
|
| - "fake_slave_build/cipd",
|
| + "[SLAVE_BUILD]\\cipd\\cipd",
|
| "ensure",
|
| "--root",
|
| - "[ROOT]\\b\\build\\slave\\cache\\cipd\\goma",
|
| + "[CACHE]\\cipd\\goma",
|
| "--list",
|
| "infra_internal/goma/client/windows-amd64 release",
|
| "--json-output",
|
| @@ -149,6 +153,7 @@
|
| "--service-account-json",
|
| "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma.ensure_installed",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| @@ -167,9 +172,10 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]\\src\\tools\\swarming_client\\swarming.py",
|
| + "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
|
| "--version"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "swarming.py --version",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -183,10 +189,11 @@
|
| "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_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "chromium_win_pch=0 component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[ROOT]\\b\\build\\slave\\cache\\cipd\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
|
| + "GYP_DEFINES": "chromium_win_pch=0 component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks (with patch)"
|
| @@ -195,7 +202,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]\\src\\testing\\scripts\\get_compile_targets.py",
|
| + "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -203,10 +210,11 @@
|
| "Debug",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"checkout\": \"[CWD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| + "{\"checkout\": \"[SLAVE_BUILD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"win8_chromium_gn_dbg\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| @@ -218,12 +226,13 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[CWD]\\src\\testing\\buildbot\\chromium.win.json",
|
| + "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [CWD]\\src\\testing\\buildbot\\chromium.win.json@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -242,7 +251,7 @@
|
| "--cached",
|
| "--name-only"
|
| ],
|
| - "cwd": "[CWD]\\src",
|
| + "cwd": "[SLAVE_BUILD]\\src",
|
| "name": "git diff to analyze patch",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -256,9 +265,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[CWD]\\src\\testing\\buildbot\\trybot_analyze_config.json",
|
| + "[SLAVE_BUILD]\\src\\testing\\buildbot\\trybot_analyze_config.json",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "read filter exclusion spec",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@path: 'testing\\\\buildbot\\\\trybot_analyze_config.json'@@@",
|
| @@ -281,6 +291,7 @@
|
| "-u",
|
| "import sys; sys.exit(0)"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "analyze",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
|
| @@ -301,6 +312,7 @@
|
| "-u",
|
| "import sys; sys.exit(0)"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "mark: before_tests"
|
| },
|
| {
|
|
|