Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus7v2_Perf.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus7v2_Perf.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus7v2_Perf.json |
index 4f0d5d02adaebfe6ebecca4980b77f2b2092e4b2..a2cad4b9416351d1f5b29fd27bf996bcae45b84f 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus7v2_Perf.json |
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus7v2_Perf.json |
@@ -80,6 +80,42 @@ |
"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/Release" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "rmtree build directory", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", |
+ "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils@@@", |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@", |
+ "@@@STEP_LOG_END@python.inline@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[BUILD]/scripts/slave/extract_build.py", |
+ "--target", |
+ "Release", |
+ "--build-archive-url", |
+ "gs://test-domain/test-archive.zip", |
+ "--factory-properties", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Nexus7v2 Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "--build-properties", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Nexus7v2 Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "extract build" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
"[BUILD]/scripts/slave/cleanup_temp.py" |
], |
"cwd": "[SLAVE_BUILD]", |
@@ -125,42 +161,6 @@ |
}, |
{ |
"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/Release" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "rmtree build directory", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", |
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils@@@", |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", |
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@", |
- "@@@STEP_LOG_END@python.inline@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[BUILD]/scripts/slave/extract_build.py", |
- "--target", |
- "Release", |
- "--build-archive-url", |
- "gs://test-domain/test-archive.zip", |
- "--factory-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Nexus7v2 Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
- "--build-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Nexus7v2 Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "extract build" |
- }, |
- { |
- "cmd": [ |
"[BUILD]/scripts/slave/daemonizer.py", |
"--", |
"[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py", |