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

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__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/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__dbg_.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__dbg_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__dbg_.json
index c76d115ad96e02b64c0e122913d9fd3ef2ef0e61..36462b1c21d7ffa0baadb8cfb93bb3a2a043a8e8 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__dbg_.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__dbg_.json
@@ -21,6 +21,7 @@
"--revision",
"src@12345"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
@@ -47,6 +48,7 @@
"RECIPE_MODULE[webrtc]/resources/cleanup_files.py",
"[SLAVE_BUILD]/src/out"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "clean test output files"
},
{
@@ -59,6 +61,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@@@@",
@@ -83,6 +86,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",
@@ -97,6 +101,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@@@@",
@@ -124,6 +129,7 @@
"--build-properties",
"{\"BUILD_CONFIG\": \"Debug\", \"buildername\": \"Android32 Tests (L Nexus5)(dbg)\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"parent_buildername\": \"Android32 Builder (dbg)\", \"parent_got_revision\": \"12345\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "extract build"
},
{
@@ -133,6 +139,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"
},
@@ -146,6 +153,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"
},
@@ -157,6 +165,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"
},
@@ -197,6 +206,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"
},
@@ -212,6 +222,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"
},
@@ -227,6 +238,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"
},
@@ -242,6 +254,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"
},
@@ -257,6 +270,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"
},
@@ -272,6 +286,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"
},
@@ -287,6 +302,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"
},
@@ -302,6 +318,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"
},
@@ -317,6 +334,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"
},
@@ -332,6 +350,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"
},
@@ -347,6 +366,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"
},
@@ -362,6 +382,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"
},
@@ -377,6 +398,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"
},
@@ -387,6 +409,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"
},
@@ -402,6 +425,7 @@
"AppRTCDemoTest",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test AppRTCDemoTest"
},
{
@@ -414,6 +438,7 @@
"libjingle_peerconnection_android_unittest",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test libjingle_peerconnection_android_unittest"
},
{
@@ -426,6 +451,7 @@
"[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
"[SLAVE_BUILD]/src/out/logcat"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -435,6 +461,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