Index: scripts/slave/recipes/client.drmemory.recipe_autogen.expected/linux_lucid_x64_drm.json |
diff --git a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/linux_lucid_x64_drm.json b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/linux_lucid_x64_drm.json |
index ca96d09897344fe1749d56d157f78564dcf11b26..dc9eba86cbcbc0cb4c0d80a530d9386a758b18d2 100644 |
--- a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/linux_lucid_x64_drm.json |
+++ b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/linux_lucid_x64_drm.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlave", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_deps': {'drmemory/dynamorio': 'https://github.com/DynamoRIO/dynamorio.git', 'tools/buildbot': 'https://github.com/DynamoRIO/buildbot.git'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'drmemory', 'url': 'https://github.com/DynamoRIO/drmemory.git'}]", |
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_deps': {'drmemory/dynamorio': 'https://github.com/DynamoRIO/dynamorio.git', 'tools/buildbot': 'https://github.com/DynamoRIO/buildbot.git'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'drmemory', 'url': 'https://github.com/DynamoRIO/drmemory.git'}]", |
"--root", |
"drmemory", |
"--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]" |
}, |
@@ -54,9 +53,8 @@ |
"60", |
"-VV", |
"-S", |
- "[SLAVE_BUILD]/drmemory/tests/runsuite.cmake,drmemory_only;long;build=0x1234567" |
+ "[CWD]/drmemory/tests/runsuite.cmake,drmemory_only;long;build=0x1234567" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Dr. Memory ctest" |
}, |
{ |
@@ -75,7 +73,6 @@ |
"build_drmemory-rel-64/Testing/Temporary", |
"xml:results" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Pack test results" |
}, |
{ |
@@ -84,13 +81,12 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"cp", |
"testlogs_r123456789abcdef_b42.7z", |
"gs://chromium-drmemory-builds/testlogs/from_linux-lucid_x64-drm" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "gsutil upload", |
"~followup_annotations": [ |
"@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-drmemory-builds/testlogs/from_linux-lucid_x64-drm@@@" |