| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__trial__dbg_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__trial__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__trial__dbg_.json
|
| index 2a88026fb9db11951e761735103a244d4a9223da..0bf3dcc14d4a3ebf99a772c20e0308ecf0db30f7 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__trial__dbg_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__trial__dbg_.json
|
| @@ -118,53 +118,6 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/cleanup_temp.py"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "cleanup_temp"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
|
| - "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps",
|
| - "[SLAVE_BUILD]/src/out/Debug/test_logs",
|
| - "[SLAVE_BUILD]/src/out/build_product.zip",
|
| - "[SLAVE_BUILD]/src"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "clean local files",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@try:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@except OSError:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ pass@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv[4]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "allow_subannotations": false,
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/src/build/tree_truth.sh",
|
| - "[SLAVE_BUILD]/src",
|
| - "src"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "tree truth steps"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| "[SLAVE_BUILD]/src/out/Debug"
|
| ],
|
| @@ -237,6 +190,53 @@
|
| },
|
| {
|
| "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[BUILD]/scripts/slave/cleanup_temp.py"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "cleanup_temp"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
|
| + "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps",
|
| + "[SLAVE_BUILD]/src/out/Debug/test_logs",
|
| + "[SLAVE_BUILD]/src/out/build_product.zip",
|
| + "[SLAVE_BUILD]/src"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "clean local files",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@try:@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@except OSError:@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ pass@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv[4]):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "allow_subannotations": false,
|
| + "cmd": [
|
| + "[SLAVE_BUILD]/src/build/tree_truth.sh",
|
| + "[SLAVE_BUILD]/src",
|
| + "src"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "tree truth steps"
|
| + },
|
| + {
|
| + "cmd": [
|
| "[BUILD]/scripts/slave/daemonizer.py",
|
| "--",
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
|
|