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

Unified Diff: scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr_package.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge 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
Index: scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr_package.json
diff --git a/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr_package.json b/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr_package.json
index c12b237a84decb67d98ffa503929ddc9f1965d76..1598a4803f6d434c5bb30addf03ab8c019aa78ea 100644
--- a/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr_package.json
+++ b/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr_package.json
@@ -11,13 +11,13 @@
"--slave",
"TestSlave",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'dynamorio', 'url': 'https://github.com/DynamoRIO/dynamorio.git'}]",
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'dynamorio', 'url': 'https://github.com/DynamoRIO/dynamorio.git'}]",
"--root",
"dynamorio",
"--revision_mapping_file",
"{}",
"--git-cache-dir",
- "[GIT_CACHE]",
+ "[ROOT]/b/build/slave/cache_dir",
"--output_json",
"/path/to/tmp/json",
"--revision",
@@ -25,7 +25,6 @@
"--force",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -52,9 +51,8 @@
"ctest",
"-VV",
"-S",
- "[SLAVE_BUILD]/dynamorio/make/package.cmake,build=0x1234567"
+ "[CWD]/dynamorio/make/package.cmake,build=0x1234567"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Package DynamoRIO"
},
{
@@ -63,13 +61,12 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"----",
"cp",
"DynamoRIO-Linux-*1234567.tar.gz",
"gs://chromium-dynamorio/builds/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-dynamorio/builds/@@@"

Powered by Google App Engine
This is Rietveld 408576698