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

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_s5.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/webrtc/standalone.expected/tryserver_webrtc_android_s5.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_s5.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_s5.json
index f0af15f37d1f15bb6d5580fd598335313b379ed4..0198254d72b03934d04104d3f99b41b5a8a43f69 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_s5.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_s5.json
@@ -27,6 +27,7 @@
"--revision",
"src@12345"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
@@ -53,6 +54,7 @@
"RECIPE_MODULE[webrtc]/resources/cleanup_files.py",
"[SLAVE_BUILD]/src/out"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "clean test output files"
},
{
@@ -65,6 +67,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@@@@",
@@ -89,6 +92,7 @@
"[DEPOT_TOOLS]/gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GYP_CROSSCOMPILE": "1",
"GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
@@ -113,6 +117,7 @@
"[BUILD]/goma",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -125,6 +130,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"
},
@@ -138,6 +144,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"
},
@@ -149,6 +156,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"
},
@@ -189,6 +197,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"
},
@@ -204,6 +213,7 @@
"audio_decoder_unittests",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -219,6 +229,7 @@
"common_audio_unittests",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -234,6 +245,7 @@
"common_video_unittests",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -249,6 +261,7 @@
"modules_tests",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -264,6 +277,7 @@
"modules_unittests",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -279,6 +293,7 @@
"system_wrappers_unittests",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -294,6 +309,7 @@
"test_support_unittests",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -309,6 +325,7 @@
"tools_unittests",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -324,6 +341,7 @@
"video_engine_core_unittests",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -339,6 +357,7 @@
"video_engine_tests",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -354,6 +373,7 @@
"voice_engine_unittests",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -369,6 +389,7 @@
"webrtc_perf_tests",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -379,6 +400,7 @@
"[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
"[SLAVE_BUILD]/src/out/Debug/apks/AppRTCDemo.apk"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
@@ -394,6 +416,7 @@
"AppRTCDemoTest",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test AppRTCDemoTest"
},
{
@@ -406,6 +429,7 @@
"libjingle_peerconnection_android_unittest",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test libjingle_peerconnection_android_unittest"
},
{
@@ -418,6 +442,7 @@
"[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
"[SLAVE_BUILD]/src/out/logcat"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -427,6 +452,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