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

Unified Diff: scripts/slave/recipes/cronet.expected/local_test.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/cronet.expected/local_test.json
diff --git a/scripts/slave/recipes/cronet.expected/local_test.json b/scripts/slave/recipes/cronet.expected/local_test.json
index 214937baa67d0c7a7ef6e5b530c9d8e0f8a443bc..2a31eb5a3df630a79081b38d09be949838f7d18e 100644
--- a/scripts/slave/recipes/cronet.expected/local_test.json
+++ b/scripts/slave/recipes/cronet.expected/local_test.json
@@ -6,6 +6,7 @@
"\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n",
"[SLAVE_BUILD]"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup index.lock",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -44,6 +45,7 @@
"--revision",
"src@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -62,6 +64,7 @@
"--spec",
"cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = ['android']"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "gclient setup"
},
{
@@ -79,6 +82,7 @@
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "gclient sync",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -122,6 +126,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@@@@",
@@ -146,6 +151,7 @@
"[DEPOT_TOOLS]/gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GYP_CROSSCOMPILE": "1",
"GYP_DEFINES": "OS=android component=static_library disable_file_support=1 disable_ftp_support=1 enable_websockets=0 fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=0 use_icu_alternatives_on_android=1",
@@ -174,6 +180,7 @@
"cronet_sample_test_apk",
"cronet_test_instrumentation_apk"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -186,6 +193,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"
},
@@ -199,6 +207,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"
},
@@ -210,6 +219,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"
},
@@ -250,6 +260,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"
},
@@ -265,6 +276,7 @@
"net_unittests",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -278,6 +290,7 @@
"--apk_package",
"org.chromium.cronet_sample_apk"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -293,6 +306,7 @@
"CronetSampleTest",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test CronetSampleTest"
},
{
@@ -303,6 +317,7 @@
"--apk_package",
"org.chromium.net"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
@@ -318,6 +333,7 @@
"CronetTestInstrumentation",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test CronetTestInstrumentation"
},
{
@@ -330,6 +346,7 @@
"[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
"[SLAVE_BUILD]/src/out/logcat"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -340,6 +357,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"
},
@@ -352,6 +370,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"
},
@@ -364,6 +383,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