| Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___shared.json
|
| diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___shared.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___shared.json
|
| index 1b2168e64bca152c78d55d8c5bb6b0169de42f7d..9c4ef8acc29e839fc5afdaf3acabcb1af4262ab9 100644
|
| --- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___shared.json
|
| +++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___shared.json
|
| @@ -11,13 +11,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",
|
| @@ -25,7 +25,6 @@
|
| "--no_shallow",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -69,10 +68,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": [
|
| @@ -86,10 +84,9 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "GYP_DEFINES": "clang=1 component=shared_library gomadir='[BUILD]/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_enable_verify_heap=1 v8_target_arch=ia32",
|
| + "GYP_DEFINES": "clang=1 component=shared_library gomadir='[ROOT]/b/build/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_enable_verify_heap=1 v8_target_arch=ia32",
|
| "GYP_GENERATORS": "ninja",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -104,7 +101,6 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -114,11 +110,10 @@
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]/v8",
|
| + "[CWD]/v8",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -145,9 +140,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",
|
| @@ -157,10 +152,9 @@
|
| "--goma-service-account-json-file",
|
| "/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": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -175,19 +169,18 @@
|
| "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/mozilla.isolated.gen.json",
|
| - "[SLAVE_BUILD]/v8/out/Release/simdjs.isolated.gen.json",
|
| - "[SLAVE_BUILD]/v8/out/Release/test262.isolated.gen.json"
|
| + "[CWD]/v8/out/Release/bot_default.isolated.gen.json",
|
| + "[CWD]/v8/out/Release/mozilla.isolated.gen.json",
|
| + "[CWD]/v8/out/Release/simdjs.isolated.gen.json",
|
| + "[CWD]/v8/out/Release/test262.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -203,7 +196,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",
|
| @@ -277,7 +270,6 @@
|
| "--json-test-results",
|
| "${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] Check on Ubuntu-12.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -298,7 +290,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",
|
| @@ -373,7 +365,6 @@
|
| "--json-test-results",
|
| "${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] Test262 - no variants on Ubuntu-12.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -394,7 +385,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",
|
| @@ -468,7 +459,6 @@
|
| "--json-test-results",
|
| "${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] Mozilla on Ubuntu-12.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -489,7 +479,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",
|
| @@ -564,7 +554,6 @@
|
| "--json-test-results",
|
| "${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] SimdJs - all on Ubuntu-12.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -588,9 +577,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",
|
| "--",
|
| @@ -603,7 +592,6 @@
|
| "1",
|
| "Check/Ubuntu-12.04/[dummy has/V8 Linux - shared/571"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Check",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
| @@ -629,9 +617,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",
|
| "--",
|
| @@ -644,7 +632,6 @@
|
| "1",
|
| "Test262 - no variants/Ubuntu-12.04/[dummy has/V8 Linux - shared/571"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Test262 - no variants",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
| @@ -670,9 +657,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",
|
| "--",
|
| @@ -685,7 +672,6 @@
|
| "1",
|
| "Mozilla/Ubuntu-12.04/[dummy has/V8 Linux - shared/571"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Mozilla",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
| @@ -711,9 +697,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",
|
| "--",
|
| @@ -726,7 +712,6 @@
|
| "1",
|
| "SimdJs - all/Ubuntu-12.04/[dummy has/V8 Linux - shared/571"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "SimdJs - all",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
|
|