Index: scripts/slave/recipe_modules/file/example.expected/file_io.json |
diff --git a/scripts/slave/recipe_modules/file/example.expected/file_io.json b/scripts/slave/recipe_modules/file/example.expected/file_io.json |
index 5d6c765a20ad367cc99a561e5320bfc70212ead2..58285309e94d3c5ab87a327f0990b88dacac0a08 100644 |
--- a/scripts/slave/recipe_modules/file/example.expected/file_io.json |
+++ b/scripts/slave/recipe_modules/file/example.expected/file_io.json |
@@ -7,6 +7,7 @@ |
"/fake/dir", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "listdir fake dir", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@[@@@", |
@@ -27,6 +28,7 @@ |
"some", |
"command" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "manipulate file 1" |
}, |
{ |
@@ -34,20 +36,23 @@ |
"some", |
"command" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "manipulate file 2" |
}, |
{ |
"cmd": [ |
"echo", |
- "[TMP]/prefix_a_tmp_1" |
+ "[TMP_BASE]/prefix_a_tmp_1" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "print prefix_a" |
}, |
{ |
"cmd": [ |
"echo", |
- "[TMP]/prefix_b_tmp_2" |
+ "[TMP_BASE]/prefix_b_tmp_2" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "print prefix_b" |
}, |
{ |
@@ -56,9 +61,10 @@ |
"-u", |
"\nimport sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\nchromium_utils.RemoveFilesWildcards(sys.argv[1], root=sys.argv[2])\n", |
"*.o", |
- "[CWD]" |
+ "[SLAVE_BUILD]" |
], |
- "name": "rmwildcard *.o in [CWD]", |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "rmwildcard *.o in [SLAVE_BUILD]", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
"@@@STEP_LOG_LINE@python.inline@import sys@@@", |
@@ -76,6 +82,7 @@ |
"abcde", |
"tmp_file.txt" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "write_simple" |
}, |
{ |
@@ -86,6 +93,7 @@ |
"tmp_file.txt", |
"/path/to/tmp/" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "read_simple" |
}, |
{ |
@@ -96,6 +104,7 @@ |
"! ~&&", |
"tmp_file.txt" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "write_symbols" |
}, |
{ |
@@ -106,6 +115,7 @@ |
"tmp_file.txt", |
"/path/to/tmp/" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "read_symbols" |
}, |
{ |
@@ -116,6 +126,7 @@ |
"abcde fgh", |
"tmp_file.txt" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "write_spaces" |
}, |
{ |
@@ -126,6 +137,7 @@ |
"tmp_file.txt", |
"/path/to/tmp/" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "read_spaces" |
}, |
{ |
@@ -136,6 +148,7 @@ |
"ab\ncd\nefg\n", |
"tmp_file.txt" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "write_multiline" |
}, |
{ |
@@ -146,6 +159,7 @@ |
"tmp_file.txt", |
"/path/to/tmp/" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "read_multiline" |
}, |
{ |
@@ -153,9 +167,10 @@ |
"python", |
"-u", |
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", |
- "[CWD]/copytree_example_tmp", |
+ "[SLAVE_BUILD]/copytree_example_tmp", |
"511" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "makedirs makedirs", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -176,19 +191,21 @@ |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
"some file content", |
- "[CWD]/copytree_example_tmp/dummy_file" |
+ "[SLAVE_BUILD]/copytree_example_tmp/dummy_file" |
], |
- "name": "write [CWD]/copytree_example_tmp/dummy_file" |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "write [SLAVE_BUILD]/copytree_example_tmp/dummy_file" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", |
- "[CWD]/copytree_example_tmp", |
- "[CWD]/copytree_example_tmp2", |
+ "[SLAVE_BUILD]/copytree_example_tmp", |
+ "[SLAVE_BUILD]/copytree_example_tmp2", |
"0" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "copytree" |
}, |
{ |
@@ -196,10 +213,11 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[CWD]/copytree_example_tmp2/dummy_file", |
+ "[SLAVE_BUILD]/copytree_example_tmp2/dummy_file", |
"/path/to/tmp/" |
], |
- "name": "read [CWD]/copytree_example_tmp2/dummy_file" |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "read [SLAVE_BUILD]/copytree_example_tmp2/dummy_file" |
}, |
{ |
"cmd": [ |
@@ -207,8 +225,9 @@ |
"-u", |
"\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", |
"/path/to/tmp/", |
- "[CWD]/copytree_example_tmp/*" |
+ "[SLAVE_BUILD]/copytree_example_tmp/*" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "glob" |
}, |
{ |
@@ -216,8 +235,9 @@ |
"python", |
"-u", |
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", |
- "[CWD]/copytree_example_tmp" |
+ "[SLAVE_BUILD]/copytree_example_tmp" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "rmtree cleanup", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -235,8 +255,9 @@ |
"python", |
"-u", |
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", |
- "[CWD]/copytree_example_tmp2" |
+ "[SLAVE_BUILD]/copytree_example_tmp2" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "rmtree cleanup2", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |