Index: scripts/slave/recipes/dart/dart_cross_tester.expected/target-arm-vm-linux-release.json |
diff --git a/scripts/slave/recipes/dart/dart_cross_tester.expected/target-arm-vm-linux-release.json b/scripts/slave/recipes/dart/dart_cross_tester.expected/target-arm-vm-linux-release.json |
index 9e64450c5fd12c98e8ce57c5df46698a296405fc..c595f7a82bbd00496bcf5886b2cac8eaf52225e9 100644 |
--- a/scripts/slave/recipes/dart/dart_cross_tester.expected/target-arm-vm-linux-release.json |
+++ b/scripts/slave/recipes/dart/dart_cross_tester.expected/target-arm-vm-linux-release.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'sdk', 'url': 'https://chromium.googlesource.com/external/github.com/dart-lang/sdk.git'}]", |
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'sdk', 'url': 'https://chromium.googlesource.com/external/github.com/dart-lang/sdk.git'}]", |
"--root", |
"sdk", |
"--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]" |
}, |
@@ -51,9 +50,9 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/sdk/tools/clean_output_directory.py" |
+ "[CWD]/sdk/tools/clean_output_directory.py" |
], |
- "cwd": "[SLAVE_BUILD]/sdk", |
+ "cwd": "[CWD]/sdk", |
"name": "clobber" |
}, |
{ |
@@ -63,7 +62,6 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -75,13 +73,13 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"----", |
"cp", |
"gs://dart-cross-compiled-binaries/cross_build_arm_release_abcd1234efef5656.tar.bz2", |
"cross_build_arm_release_abcd1234efef5656.tar.bz2" |
], |
- "cwd": "[SLAVE_BUILD]/sdk", |
+ "cwd": "[CWD]/sdk", |
"name": "gsutil download tarball" |
}, |
{ |
@@ -90,14 +88,14 @@ |
"-xjf", |
"cross_build_arm_release_abcd1234efef5656.tar.bz2" |
], |
- "cwd": "[SLAVE_BUILD]/sdk", |
+ "cwd": "[CWD]/sdk", |
"name": "untar tarball" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/sdk/tools/test.py", |
+ "[CWD]/sdk/tools/test.py", |
"--mode=release", |
"--arch=arm", |
"--progress=line", |
@@ -108,14 +106,14 @@ |
"--write-test-outcome-log", |
"--exclude-suite=pkg" |
], |
- "cwd": "[SLAVE_BUILD]/sdk", |
+ "cwd": "[CWD]/sdk", |
"name": "vm tests" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/sdk/tools/test.py", |
+ "[CWD]/sdk/tools/test.py", |
"--mode=release", |
"--arch=arm", |
"--progress=line", |
@@ -128,7 +126,7 @@ |
"--checked", |
"--append_logs" |
], |
- "cwd": "[SLAVE_BUILD]/sdk", |
+ "cwd": "[CWD]/sdk", |
"name": "checked vm tests" |
}, |
{ |
@@ -136,16 +134,16 @@ |
"rm", |
"cross_build_arm_release_abcd1234efef5656.tar.bz2" |
], |
- "cwd": "[SLAVE_BUILD]/sdk", |
+ "cwd": "[CWD]/sdk", |
"name": "delete tarball" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/sdk/tools/clean_output_directory.py" |
+ "[CWD]/sdk/tools/clean_output_directory.py" |
], |
- "cwd": "[SLAVE_BUILD]/sdk", |
+ "cwd": "[CWD]/sdk", |
"name": "clobber (2)" |
}, |
{ |