| Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___cfi.json
|
| diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___cfi.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___cfi.json
|
| index 0a7e69e2d14550b4fdd36998aa474bdb9f0b00b2..e163494b06c08c33bb863c56414e8f9847bc2639 100644
|
| --- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___cfi.json
|
| +++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___cfi.json
|
| @@ -11,13 +11,13 @@
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| - "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'}]",
|
| + "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'}]",
|
| "--root",
|
| "v8",
|
| "--revision_mapping_file",
|
| "{\"v8\": \"got_revision\", \"v8/tools/swarming_client\": \"got_swarming_client_revision\"}",
|
| "--git-cache-dir",
|
| - "[ROOT]/b/build/slave/cache_dir",
|
| + "[GIT_CACHE]",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| @@ -25,6 +25,7 @@
|
| "--no_shallow",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -68,9 +69,10 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/v8/tools/swarming_client/swarming.py",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
|
| "--version"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "swarming.py --version",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -84,9 +86,10 @@
|
| "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": "cfi_diag=1 cfi_vptr=1 clang=1 gomadir='[ROOT]/b/build/goma' release_extra_cflags='-O1 -fno-inline-functions -fno-inline' target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
|
| + "GYP_DEFINES": "cfi_diag=1 cfi_vptr=1 clang=1 gomadir='[BUILD]/goma' release_extra_cflags='-O1 -fno-inline-functions -fno-inline' target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64",
|
| "GYP_GENERATORS": "ninja",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -101,6 +104,7 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -110,10 +114,11 @@
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
|
| "--src-dir",
|
| - "[CWD]/v8",
|
| + "[SLAVE_BUILD]/v8",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -140,9 +145,9 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[CWD]/v8",
|
| + "[SLAVE_BUILD]/v8",
|
| "--goma-cache-dir",
|
| - "[ROOT]/b/build/slave/goma_cache",
|
| + "[GOMA_CACHE]",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -152,9 +157,10 @@
|
| "--goma-service-account-json-file",
|
| "/creds/service_accounts/service-account-goma-client.json",
|
| "--goma-dir",
|
| - "[ROOT]/b/build/goma",
|
| + "[BUILD]/goma",
|
| "--"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -169,21 +175,22 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/isolate.py",
|
| - "[CWD]/v8/tools/swarming_client",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client",
|
| "batcharchive",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[CWD]/v8/out/Release/benchmarks.isolated.gen.json",
|
| - "[CWD]/v8/out/Release/bot_default.isolated.gen.json",
|
| - "[CWD]/v8/out/Release/ignition.isolated.gen.json",
|
| - "[CWD]/v8/out/Release/mozilla.isolated.gen.json",
|
| - "[CWD]/v8/out/Release/optimize_for_size.isolated.gen.json",
|
| - "[CWD]/v8/out/Release/simdjs.isolated.gen.json",
|
| - "[CWD]/v8/out/Release/test262.isolated.gen.json"
|
| + "[SLAVE_BUILD]/v8/out/Release/benchmarks.isolated.gen.json",
|
| + "[SLAVE_BUILD]/v8/out/Release/bot_default.isolated.gen.json",
|
| + "[SLAVE_BUILD]/v8/out/Release/ignition.isolated.gen.json",
|
| + "[SLAVE_BUILD]/v8/out/Release/mozilla.isolated.gen.json",
|
| + "[SLAVE_BUILD]/v8/out/Release/optimize_for_size.isolated.gen.json",
|
| + "[SLAVE_BUILD]/v8/out/Release/simdjs.isolated.gen.json",
|
| + "[SLAVE_BUILD]/v8/out/Release/test262.isolated.gen.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -202,7 +209,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/v8/tools/swarming_client/swarming.py",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -277,6 +284,7 @@
|
| "--json-test-results",
|
| "${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] Check on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -297,7 +305,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/v8/tools/swarming_client/swarming.py",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -373,6 +381,7 @@
|
| "--json-test-results",
|
| "${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] OptimizeForSize on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -393,7 +402,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/v8/tools/swarming_client/swarming.py",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -469,6 +478,7 @@
|
| "--json-test-results",
|
| "${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] Benchmarks on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -489,7 +499,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/v8/tools/swarming_client/swarming.py",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -565,6 +575,7 @@
|
| "--json-test-results",
|
| "${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] Test262 - no variants on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -585,7 +596,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/v8/tools/swarming_client/swarming.py",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -660,6 +671,7 @@
|
| "--json-test-results",
|
| "${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] Mozilla on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -680,7 +692,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/v8/tools/swarming_client/swarming.py",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -756,6 +768,7 @@
|
| "--json-test-results",
|
| "${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] SimdJs - all on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -776,7 +789,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/v8/tools/swarming_client/swarming.py",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -852,6 +865,7 @@
|
| "--json-test-results",
|
| "${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] Ignition - turbofan on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -875,9 +889,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
|
| "--swarming-client-dir",
|
| - "[CWD]/v8/tools/swarming_client",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client",
|
| "--temp-root-dir",
|
| - "[TMP]",
|
| + "[TMP_BASE]",
|
| "--merged-test-output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -890,6 +904,7 @@
|
| "1",
|
| "Check/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Check",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
| @@ -915,9 +930,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
|
| "--swarming-client-dir",
|
| - "[CWD]/v8/tools/swarming_client",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client",
|
| "--temp-root-dir",
|
| - "[TMP]",
|
| + "[TMP_BASE]",
|
| "--merged-test-output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -930,6 +945,7 @@
|
| "1",
|
| "OptimizeForSize/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "OptimizeForSize",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
| @@ -955,9 +971,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
|
| "--swarming-client-dir",
|
| - "[CWD]/v8/tools/swarming_client",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client",
|
| "--temp-root-dir",
|
| - "[TMP]",
|
| + "[TMP_BASE]",
|
| "--merged-test-output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -970,6 +986,7 @@
|
| "1",
|
| "Benchmarks/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Benchmarks",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
| @@ -995,9 +1012,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
|
| "--swarming-client-dir",
|
| - "[CWD]/v8/tools/swarming_client",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client",
|
| "--temp-root-dir",
|
| - "[TMP]",
|
| + "[TMP_BASE]",
|
| "--merged-test-output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -1010,6 +1027,7 @@
|
| "1",
|
| "Test262 - no variants/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Test262 - no variants",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
| @@ -1035,9 +1053,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
|
| "--swarming-client-dir",
|
| - "[CWD]/v8/tools/swarming_client",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client",
|
| "--temp-root-dir",
|
| - "[TMP]",
|
| + "[TMP_BASE]",
|
| "--merged-test-output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -1050,6 +1068,7 @@
|
| "1",
|
| "Mozilla/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Mozilla",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
| @@ -1075,9 +1094,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
|
| "--swarming-client-dir",
|
| - "[CWD]/v8/tools/swarming_client",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client",
|
| "--temp-root-dir",
|
| - "[TMP]",
|
| + "[TMP_BASE]",
|
| "--merged-test-output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -1090,6 +1109,7 @@
|
| "1",
|
| "SimdJs - all/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "SimdJs - all",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
| @@ -1115,9 +1135,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
|
| "--swarming-client-dir",
|
| - "[CWD]/v8/tools/swarming_client",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client",
|
| "--temp-root-dir",
|
| - "[TMP]",
|
| + "[TMP_BASE]",
|
| "--merged-test-output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -1130,6 +1150,7 @@
|
| "1",
|
| "Ignition - turbofan/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Ignition - turbofan",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
|
|