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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android_tests__jb_nexus7_2_.json

Issue 505153002: WebRTC: Remove android_apk recipe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Rebased Created 6 years, 4 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
« no previous file with comments | « scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android_builder_forced.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android_tests__jb_nexus7_2__dbg_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android_tests__jb_nexus7_2_.json
diff --git a/scripts/slave/recipes/webrtc/android_apk.expected/client_webrtc_Android_Chromium_APK_Tests__KK_Nexus5__forced.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android_tests__jb_nexus7_2_.json
similarity index 51%
rename from scripts/slave/recipes/webrtc/android_apk.expected/client_webrtc_Android_Chromium_APK_Tests__KK_Nexus5__forced.json
rename to scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android_tests__jb_nexus7_2_.json
index 859f47c4c03b2bc8f4405e6533d559fb0044c403..6325c30bd8e8df0ee91d5f8db883a381e7c21404 100644
--- a/scripts/slave/recipes/webrtc/android_apk.expected/client_webrtc_Android_Chromium_APK_Tests__KK_Nexus5__forced.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android_tests__jb_nexus7_2_.json
@@ -3,86 +3,42 @@
"cmd": [
"python",
"-u",
- "[BUILD]/scripts/slave/bot_update.py",
- "--master",
- "client.webrtc",
- "--builder",
- "Android Chromium-APK Tests (KK Nexus5)",
- "--slave",
- "fake_slavename",
+ "[DEPOT_TOOLS]/gclient.py",
+ "config",
"--spec",
- "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk', 'webrtc_revision': '12345'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/webrtc-limited'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc.DEPS', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/deps/third_party/webrtc/webrtc.DEPS'}]\ntarget_os = ['android']",
- "--revision_mapping_file",
- "{\"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/webrtc\": \"got_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@HEAD",
- "--revision",
- "src/third_party/libjingle/source/talk@HEAD",
- "--revision",
- "src/third_party/webrtc@HEAD"
+ "cache_dir = None\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/webrtc/trunk'}, {'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/webrtc-limited'}]\ntarget_os = ['android']"
],
- "name": "bot_update (without patch)",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": 274981, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_git\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": 120644, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_git\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": 276089, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_git\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": 43426, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_git\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision\": 124383, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision_git\": \"5e2293dffc3cd07d37fbedea3b500f0eb650614d\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",
- "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@120644@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_git@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webkit_revision_git@\"5e2293dffc3cd07d37fbedea3b500f0eb650614d\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_git@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_git@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_git@\"0f90628433546e61d9268596da93418c623137f4\"@@@"
- ]
+ "name": "gclient setup"
},
{
"cmd": [
"python",
"-u",
- "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
- "[SLAVE_BUILD]/src/out/Release/debug_info_dumps",
- "[SLAVE_BUILD]/src/out/Release/test_logs",
- "[SLAVE_BUILD]/src/out/build_product.zip",
- "[SLAVE_BUILD]/src"
+ "[DEPOT_TOOLS]/gclient.py",
+ "sync",
+ "--nohooks",
+ "--delete_unversioned_trees",
+ "--force",
+ "--verbose",
+ "--revision",
+ "src@12345",
+ "--output-json",
+ "/path/to/tmp/json"
],
- "name": "clean local files",
+ "name": "gclient sync",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@",
- "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@",
- "@@@STEP_LOG_LINE@python.inline@try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@",
- "@@@STEP_LOG_LINE@python.inline@except OSError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv[4]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",
- "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@",
- "@@@STEP_LOG_END@python.inline@@@"
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"webrtc-limited/\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": 24644@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@170242@@@"
]
},
{
@@ -94,8 +50,7 @@
],
"env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1"
},
"name": "gclient runhooks"
},
@@ -103,9 +58,19 @@
"cmd": [
"python",
"-u",
- "[BUILD]/scripts/slave/cleanup_temp.py"
+ "\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"
],
- "name": "cleanup_temp"
+ "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": [
@@ -119,14 +84,41 @@
"--build_revision",
"12345",
"--factory-properties",
- "{\"BUILD_CONFIG\": \"Release\", \"TARGET_ARCH\": \"arm\", \"TARGET_BITS\": 32, \"TARGET_PLATFORM\": \"android\", \"buildername\": \"Android Chromium-APK Tests (KK Nexus5)\", \"mastername\": \"client.webrtc\", \"parent_buildername\": \"Android Chromium-APK Builder\", \"parent_got_revision\": \"12345\", \"recipe\": \"webrtc/android_apk\", \"slavename\": \"fake_slavename\"}",
+ "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android Tests (JB Nexus7.2)\", \"mastername\": \"client.webrtc\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": \"12345\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
"--build-properties",
- "{\"BUILD_CONFIG\": \"Release\", \"TARGET_ARCH\": \"arm\", \"TARGET_BITS\": 32, \"TARGET_PLATFORM\": \"android\", \"buildername\": \"Android Chromium-APK Tests (KK Nexus5)\", \"mastername\": \"client.webrtc\", \"parent_buildername\": \"Android Chromium-APK Builder\", \"parent_got_revision\": \"12345\", \"recipe\": \"webrtc/android_apk\", \"slavename\": \"fake_slavename\"}"
+ "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android Tests (JB Nexus7.2)\", \"mastername\": \"client.webrtc\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": \"12345\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}"
],
"name": "extract build"
},
{
"cmd": [
+ "python",
+ "-u",
+ "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
+ "[SLAVE_BUILD]/src/out/Release/debug_info_dumps",
+ "[SLAVE_BUILD]/src/out/Release/test_logs",
+ "[SLAVE_BUILD]/src/out/build_product.zip",
+ "[SLAVE_BUILD]/src"
+ ],
+ "name": "clean local files",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@",
+ "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@",
+ "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@",
+ "@@@STEP_LOG_LINE@python.inline@try:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@",
+ "@@@STEP_LOG_LINE@python.inline@except OSError:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ pass@@@",
+ "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv[4]):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
"[BUILD]/scripts/slave/daemonizer.py",
"--",
"[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
@@ -168,12 +160,12 @@
"-s",
"audio_decoder_unittests",
"--verbose",
+ "--isolate-file-path",
+ "webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate",
"--release"
],
"env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
"name": "audio_decoder_unittests"
},
@@ -186,12 +178,12 @@
"-s",
"common_audio_unittests",
"--verbose",
+ "--isolate-file-path",
+ "webrtc/common_audio/common_audio_unittests.isolate",
"--release"
],
"env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
"name": "common_audio_unittests"
},
@@ -204,12 +196,12 @@
"-s",
"common_video_unittests",
"--verbose",
+ "--isolate-file-path",
+ "webrtc/common_video/common_video_unittests.isolate",
"--release"
],
"env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
"name": "common_video_unittests"
},
@@ -222,12 +214,12 @@
"-s",
"modules_tests",
"--verbose",
+ "--isolate-file-path",
+ "webrtc/modules/modules_tests.isolate",
"--release"
],
"env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
"name": "modules_tests"
},
@@ -240,12 +232,12 @@
"-s",
"modules_unittests",
"--verbose",
+ "--isolate-file-path",
+ "webrtc/modules/modules_unittests.isolate",
"--release"
],
"env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
"name": "modules_unittests"
},
@@ -258,12 +250,12 @@
"-s",
"system_wrappers_unittests",
"--verbose",
+ "--isolate-file-path",
+ "webrtc/system_wrappers/source/system_wrappers_unittests.isolate",
"--release"
],
"env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
"name": "system_wrappers_unittests"
},
@@ -276,12 +268,12 @@
"-s",
"test_support_unittests",
"--verbose",
+ "--isolate-file-path",
+ "webrtc/test/test_support_unittests.isolate",
"--release"
],
"env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
"name": "test_support_unittests"
},
@@ -294,12 +286,12 @@
"-s",
"tools_unittests",
"--verbose",
+ "--isolate-file-path",
+ "webrtc/tools/tools_unittests.isolate",
"--release"
],
"env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
"name": "tools_unittests"
},
@@ -310,16 +302,16 @@
"[SLAVE_BUILD]/src/build/android/test_runner.py",
"gtest",
"-s",
- "video_engine_core_unittests",
+ "video_capture_tests",
"--verbose",
+ "--isolate-file-path",
+ "webrtc/modules/video_capture/video_capture_tests.isolate",
"--release"
],
"env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
- "name": "video_engine_core_unittests"
+ "name": "video_capture_tests"
},
{
"cmd": [
@@ -328,16 +320,16 @@
"[SLAVE_BUILD]/src/build/android/test_runner.py",
"gtest",
"-s",
- "video_engine_tests",
+ "video_engine_core_unittests",
"--verbose",
+ "--isolate-file-path",
+ "webrtc/video_engine/video_engine_core_unittests.isolate",
"--release"
],
"env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
- "name": "video_engine_tests"
+ "name": "video_engine_core_unittests"
},
{
"cmd": [
@@ -346,16 +338,16 @@
"[SLAVE_BUILD]/src/build/android/test_runner.py",
"gtest",
"-s",
- "voice_engine_unittests",
+ "video_engine_tests",
"--verbose",
+ "--isolate-file-path",
+ "webrtc/video_engine_tests.isolate",
"--release"
],
"env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
- "name": "voice_engine_unittests"
+ "name": "video_engine_tests"
},
{
"cmd": [
@@ -364,16 +356,16 @@
"[SLAVE_BUILD]/src/build/android/test_runner.py",
"gtest",
"-s",
- "video_capture_tests",
+ "voice_engine_unittests",
"--verbose",
+ "--isolate-file-path",
+ "webrtc/voice_engine/voice_engine_unittests.isolate",
"--release"
],
"env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
- "name": "video_capture_tests"
+ "name": "voice_engine_unittests"
},
{
"cmd": [
@@ -384,12 +376,12 @@
"-s",
"webrtc_perf_tests",
"--verbose",
+ "--isolate-file-path",
+ "webrtc/webrtc_perf_tests.isolate",
"--release"
],
"env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1",
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
+ "CHECKOUT_SOURCE_ROOT": "[SLAVE_BUILD]/src"
},
"name": "webrtc_perf_tests"
},
« no previous file with comments | « scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android_builder_forced.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android_tests__jb_nexus7_2__dbg_.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698