Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___nosnap___shared.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___debug_builder.json ('k') | scripts/slave/recipes/v8.expected/full_client_v8_V8_Win64.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 197f1d2d8e3657544184a107fbde81ee86df21e6..a95711bc8fb1a87d51d4e352fcdaa3899aef08e4 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,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': {'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",
@@ -33,6 +34,7 @@
"--no_shallow",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -76,9 +78,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": [
@@ -92,9 +95,10 @@
"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='[ROOT]\\b\\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='[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]"
},
@@ -109,6 +113,7 @@
"python",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -126,9 +131,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",
@@ -138,9 +143,10 @@
"--goma-service-account-json-file",
"C:\\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": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
@@ -155,16 +161,17 @@
"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\\bot_default.isolated.gen.json",
- "[CWD]\\v8\\out\\Release\\ignition.isolated.gen.json"
+ "[SLAVE_BUILD]\\v8\\out\\Release\\bot_default.isolated.gen.json",
+ "[SLAVE_BUILD]\\v8\\out\\Release\\ignition.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -178,7 +185,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",
@@ -253,6 +260,7 @@
"--json-test-results",
"${ISOLATED_OUTDIR}/output.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[trigger] Check on Windows-7-SP1",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -279,7 +287,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",
@@ -355,6 +363,7 @@
"--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@{@@@",
@@ -378,9 +387,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",
"--",
@@ -393,6 +402,7 @@
"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@@@",
@@ -418,9 +428,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",
"--",
@@ -433,6 +443,7 @@
"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@@@",
« no previous file with comments | « scripts/slave/recipes/v8.expected/full_client_v8_V8_Win32___debug_builder.json ('k') | scripts/slave/recipes/v8.expected/full_client_v8_V8_Win64.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698