Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests__dbg_.json

Issue 1115453002: Recipes: make cwd default to slave_build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests__dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests__dbg_.json
index 50765a918f17dc1d5da212613f5eec5c60ff4d27..61faff587f54b8106c3a5eb54d2ca296e58f1113 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests__dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests__dbg_.json
@@ -21,6 +21,7 @@
"--revision",
"src@1111111"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
@@ -67,6 +68,7 @@
"[DEPOT_TOOLS]/gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GYP_CROSSCOMPILE": "1",
"GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
@@ -82,6 +84,7 @@
"[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
"@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
@@ -104,6 +107,7 @@
"--properties",
"{\"buildername\": \"Android Tests (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -116,6 +120,7 @@
"-u",
"[BUILD]/scripts/slave/cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -128,6 +133,7 @@
"[SLAVE_BUILD]/src/out/build_product.zip",
"[SLAVE_BUILD]/src"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "clean local files",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -152,6 +158,7 @@
"[SLAVE_BUILD]/src",
"src"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "tree truth steps"
},
{
@@ -161,6 +168,7 @@
"\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"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree build directory",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -186,6 +194,7 @@
"--build-properties",
"{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Tests (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Android Builder (dbg)\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "extract build"
},
{
@@ -196,6 +205,7 @@
"['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "List adb devices",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[@@@",
@@ -212,6 +222,7 @@
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"014E1F310401C009"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Root devices",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -231,6 +242,7 @@
"[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
"[SLAVE_BUILD]/src/out/logcat"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -244,6 +256,7 @@
"--adb-path",
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -255,6 +268,7 @@
"--json-output",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -295,6 +309,7 @@
"-t",
"Debug"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -308,6 +323,7 @@
"--apk_package",
"org.chromium.android_webview.shell"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -329,6 +345,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test AndroidWebViewTest",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
@@ -342,6 +359,7 @@
"--apk_package",
"org.chromium.chrome.shell"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -363,6 +381,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ChromeShellTest",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
@@ -376,6 +395,7 @@
"--apk_package",
"org.chromium.content_shell_apk"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -397,6 +417,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ContentShellTest",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
@@ -410,6 +431,7 @@
"--apk_package",
"org.chromium.chrome.browser.sync"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -429,6 +451,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ChromeSyncShellTest",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
@@ -447,6 +470,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -465,6 +489,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -484,6 +509,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -502,6 +528,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -520,6 +547,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -538,6 +566,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -556,6 +585,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -574,6 +604,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -592,6 +623,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -610,6 +642,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -628,6 +661,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -646,6 +680,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -664,6 +699,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -682,6 +718,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -700,6 +737,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -718,6 +756,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -736,6 +775,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -754,6 +794,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -772,6 +813,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -790,6 +832,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -808,6 +851,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -825,6 +869,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -845,6 +890,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -865,6 +911,7 @@
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -882,6 +929,7 @@
"[SLAVE_BUILD]/src/out/Debug/full_log",
"[SLAVE_BUILD]/src/out/logcat"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -898,6 +946,7 @@
"[SLAVE_BUILD]/src/out/Debug/full_log",
"gs://chromium-android/logcat_dumps/Android Tests (dbg)/571"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Tests (dbg)/571@@@"
@@ -911,6 +960,7 @@
"--more-info",
"[SLAVE_BUILD]/src/out/Debug/full_log"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -923,6 +973,7 @@
"-s",
"-w"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -935,6 +986,7 @@
"\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
"[SLAVE_BUILD]/src/out/Debug/test_logs/*.log"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "test_report",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",

Powered by Google App Engine
This is Rietveld 408576698