| Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___nosnap___shared.json
|
| diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___nosnap___shared.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___nosnap___shared.json
|
| index a95711bc8fb1a87d51d4e352fcdaa3899aef08e4..197f1d2d8e3657544184a107fbde81ee86df21e6 100644
|
| --- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___nosnap___shared.json
|
| +++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___nosnap___shared.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': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]",
|
| + "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]",
|
| "--root",
|
| "v8",
|
| "--revision_mapping_file",
|
| "{\"v8\": \"got_revision\", \"v8/tools/swarming_client\": \"got_swarming_client_revision\"}",
|
| "--git-cache-dir",
|
| - "[GIT_CACHE]",
|
| + "[ROOT]\\b\\build\\slave\\cache_dir",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| @@ -34,7 +33,6 @@
|
| "--no_shallow",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -78,10 +76,9 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\v8\\tools\\swarming_client\\swarming.py",
|
| + "[CWD]\\v8\\tools\\swarming_client\\swarming.py",
|
| "--version"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "swarming.py --version",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -95,10 +92,9 @@
|
| "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": "chromium_win_pch=0 component=shared_library fastbuild=1 gomadir='[BUILD]\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_target_arch=ia32 v8_use_snapshot=false",
|
| + "GYP_DEFINES": "chromium_win_pch=0 component=shared_library fastbuild=1 gomadir='[ROOT]\\b\\build\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_target_arch=ia32 v8_use_snapshot=false",
|
| "GYP_GENERATORS": "ninja",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -113,7 +109,6 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -131,9 +126,9 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]\\v8",
|
| + "[CWD]\\v8",
|
| "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| + "[ROOT]\\b\\build\\slave\\goma_cache",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -143,10 +138,9 @@
|
| "--goma-service-account-json-file",
|
| "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "--goma-dir",
|
| - "[BUILD]\\goma",
|
| + "[ROOT]\\b\\build\\goma",
|
| "--"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -161,17 +155,16 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]\\resources\\isolate.py",
|
| - "[SLAVE_BUILD]\\v8\\tools\\swarming_client",
|
| + "[CWD]\\v8\\tools\\swarming_client",
|
| "batcharchive",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[SLAVE_BUILD]\\v8\\out\\Release\\bot_default.isolated.gen.json",
|
| - "[SLAVE_BUILD]\\v8\\out\\Release\\ignition.isolated.gen.json"
|
| + "[CWD]\\v8\\out\\Release\\bot_default.isolated.gen.json",
|
| + "[CWD]\\v8\\out\\Release\\ignition.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -185,7 +178,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\v8\\tools\\swarming_client\\swarming.py",
|
| + "[CWD]\\v8\\tools\\swarming_client\\swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -260,7 +253,6 @@
|
| "--json-test-results",
|
| "${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] Check on Windows-7-SP1",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -287,7 +279,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\v8\\tools\\swarming_client\\swarming.py",
|
| + "[CWD]\\v8\\tools\\swarming_client\\swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -363,7 +355,6 @@
|
| "--json-test-results",
|
| "${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] Ignition - turbofan on Windows-7-SP1",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -387,9 +378,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::v8]\\resources\\collect_v8_task.py",
|
| "--swarming-client-dir",
|
| - "[SLAVE_BUILD]\\v8\\tools\\swarming_client",
|
| + "[CWD]\\v8\\tools\\swarming_client",
|
| "--temp-root-dir",
|
| - "[TMP_BASE]",
|
| + "[TMP]",
|
| "--merged-test-output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -402,7 +393,6 @@
|
| "2",
|
| "Check/Windows-7-SP1/[dummy has/V8 Win32 - nosnap - shared/571"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Check",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
| @@ -428,9 +418,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::v8]\\resources\\collect_v8_task.py",
|
| "--swarming-client-dir",
|
| - "[SLAVE_BUILD]\\v8\\tools\\swarming_client",
|
| + "[CWD]\\v8\\tools\\swarming_client",
|
| "--temp-root-dir",
|
| - "[TMP_BASE]",
|
| + "[TMP]",
|
| "--merged-test-output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -443,7 +433,6 @@
|
| "1",
|
| "Ignition - turbofan/Windows-7-SP1/[dummy has/V8 Win32 - nosnap - shared/571"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Ignition - turbofan",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
|
|