diff options
22 files changed, 27 insertions, 44 deletions
diff --git a/build/common.gypi b/build/common.gypi index b96e00fd..aab65ea7 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -178,6 +178,7 @@ # that get overridden by -Wextra. '-Wno-unused-parameter', '-Wno-missing-field-initializers', + '-Wno-strict-overflow', ], 'cflags_cc': [ '-Wnon-virtual-dtor', diff --git a/build/isolate.gypi b/build/isolate.gypi index 91b92a66..510c47e2 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -52,9 +52,9 @@ 'extension': 'isolate', 'inputs': [ # Files that are known to be involved in this step. - '<(DEPTH)/tools/swarm_client/isolate.py', - '<(DEPTH)/tools/swarm_client/run_isolated.py', - '<(DEPTH)/tools/swarm_client/googletest/run_test_cases.py', + '<(DEPTH)/tools/swarming_client/isolate.py', + '<(DEPTH)/tools/swarming_client/run_isolated.py', + '<(DEPTH)/tools/swarming_client/googletest/run_test_cases.py', # Disable file tracking by the build driver for now. This means the # project must have the proper build-time dependency for their runtime @@ -75,7 +75,7 @@ ["test_isolation_outdir==''", { 'action': [ 'python', - '<(DEPTH)/tools/swarm_client/isolate.py', + '<(DEPTH)/tools/swarming_client/isolate.py', '<(test_isolation_mode)', # GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot # be provided twice. To work around this behavior, append '/'. @@ -95,7 +95,7 @@ }, { 'action': [ 'python', - '<(DEPTH)/tools/swarm_client/isolate.py', + '<(DEPTH)/tools/swarming_client/isolate.py', '<(test_isolation_mode)', '--outdir', '<(test_isolation_outdir)', # See comment above. diff --git a/common_audio/common_audio_unittests.isolate b/common_audio/common_audio_unittests.isolate index ca4bee65..49f1e984 100644 --- a/common_audio/common_audio_unittests.isolate +++ b/common_audio/common_audio_unittests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../testing/test_env.py', - '../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -29,7 +28,7 @@ '<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarm_client/', + '../../tools/swarming_client/', ], }, }], diff --git a/common_video/common_video_unittests.isolate b/common_video/common_video_unittests.isolate index 06d86dc5..a95bd414 100644 --- a/common_video/common_video_unittests.isolate +++ b/common_video/common_video_unittests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../testing/test_env.py', - '../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -31,7 +30,7 @@ '<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarm_client/', + '../../tools/swarming_client/', ], }, }], diff --git a/modules/audio_coding/neteq/neteq_unittests.isolate b/modules/audio_coding/neteq/neteq_unittests.isolate index 3e540c3e..e8f4e482 100644 --- a/modules/audio_coding/neteq/neteq_unittests.isolate +++ b/modules/audio_coding/neteq/neteq_unittests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../../../testing/test_env.py', - '../../../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/neteq_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_touched': [ @@ -37,7 +36,7 @@ '<(PRODUCT_DIR)/neteq_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../../../tools/swarm_client/', + '../../../../tools/swarming_client/', ], }, }], diff --git a/modules/audio_coding/neteq4/audio_decoder_unittests.isolate b/modules/audio_coding/neteq4/audio_decoder_unittests.isolate index d2d858c5..bb57e74b 100644 --- a/modules/audio_coding/neteq4/audio_decoder_unittests.isolate +++ b/modules/audio_coding/neteq4/audio_decoder_unittests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../../../testing/test_env.py', - '../../../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_touched': [ @@ -33,7 +32,7 @@ '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../../../tools/swarm_client/', + '../../../../tools/swarming_client/', ], }, }], diff --git a/modules/audio_device/android/test/project.properties b/modules/audio_device/android/test/project.properties index dc510e30..8459f9b8 100644 --- a/modules/audio_device/android/test/project.properties +++ b/modules/audio_device/android/test/project.properties @@ -11,6 +11,6 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-17 +target=android-19 -java.compilerargs=-Xlint:all -Werror
\ No newline at end of file +java.compilerargs=-Xlint:all -Werror diff --git a/modules/audio_device/audio_device_tests.isolate b/modules/audio_device/audio_device_tests.isolate index 8f336cdb..69e877c1 100644 --- a/modules/audio_device/audio_device_tests.isolate +++ b/modules/audio_device/audio_device_tests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../../testing/test_env.py', - '../../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -29,7 +28,7 @@ '<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../../tools/swarm_client/', + '../../../tools/swarming_client/', ], }, }], diff --git a/modules/modules_tests.isolate b/modules/modules_tests.isolate index c24ff9c3..7a051f66 100644 --- a/modules/modules_tests.isolate +++ b/modules/modules_tests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../testing/test_env.py', - '../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -34,7 +33,7 @@ '<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarm_client/', + '../../tools/swarming_client/', ], }, }], diff --git a/modules/modules_unittests.isolate b/modules/modules_unittests.isolate index 32fc6628..aa91238c 100644 --- a/modules/modules_unittests.isolate +++ b/modules/modules_unittests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../testing/test_env.py', - '../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -79,7 +78,7 @@ '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarm_client/', + '../../tools/swarming_client/', ], }, }], diff --git a/modules/video_capture/video_capture_tests.isolate b/modules/video_capture/video_capture_tests.isolate index d07255f4..30374ce4 100644 --- a/modules/video_capture/video_capture_tests.isolate +++ b/modules/video_capture/video_capture_tests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../../testing/test_env.py', - '../../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -29,7 +28,7 @@ '<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../../tools/swarm_client/', + '../../../tools/swarming_client/', ], }, }], diff --git a/modules/video_render/video_render_tests.isolate b/modules/video_render/video_render_tests.isolate index faf03be3..397ec04e 100644 --- a/modules/video_render/video_render_tests.isolate +++ b/modules/video_render/video_render_tests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../../testing/test_env.py', - '../../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -29,7 +28,7 @@ '<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../../tools/swarm_client/', + '../../../tools/swarming_client/', ], }, }], diff --git a/system_wrappers/source/system_wrappers_unittests.isolate b/system_wrappers/source/system_wrappers_unittests.isolate index b03e4b83..6ec5e7c6 100644 --- a/system_wrappers/source/system_wrappers_unittests.isolate +++ b/system_wrappers/source/system_wrappers_unittests.isolate @@ -22,7 +22,6 @@ 'variables': { 'command': [ '../../../testing/test_env.py', - '../../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -30,7 +29,7 @@ '<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../../tools/swarm_client/', + '../../../tools/swarming_client/', ], }, }], diff --git a/test/metrics_unittests.isolate b/test/metrics_unittests.isolate index a9fb1d89..1a196d65 100644 --- a/test/metrics_unittests.isolate +++ b/test/metrics_unittests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../testing/test_env.py', - '../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/metrics_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -31,7 +30,7 @@ '<(PRODUCT_DIR)/metrics_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarm_client/', + '../../tools/swarming_client/', ], }, }], diff --git a/test/test_support_unittests.isolate b/test/test_support_unittests.isolate index b885d447..0f5de650 100644 --- a/test/test_support_unittests.isolate +++ b/test/test_support_unittests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../testing/test_env.py', - '../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -30,7 +29,7 @@ '<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarm_client/', + '../../tools/swarming_client/', ], }, }], diff --git a/tools/tools_unittests.isolate b/tools/tools_unittests.isolate index 618c6db1..54037805 100644 --- a/tools/tools_unittests.isolate +++ b/tools/tools_unittests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../testing/test_env.py', - '../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -31,7 +30,7 @@ '<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarm_client/', + '../../tools/swarming_client/', ], }, }], diff --git a/video_engine/test/android/project.properties b/video_engine/test/android/project.properties index 8cb5d3b4..162fe605 100644 --- a/video_engine/test/android/project.properties +++ b/video_engine/test/android/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-17
\ No newline at end of file +target=android-19 diff --git a/video_engine/test/auto_test/vie_auto_test.isolate b/video_engine/test/auto_test/vie_auto_test.isolate index 8ce6a15b..577e63f3 100644 --- a/video_engine/test/auto_test/vie_auto_test.isolate +++ b/video_engine/test/auto_test/vie_auto_test.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../../../testing/test_env.py', - '../../../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/vie_auto_test<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_touched': [ @@ -32,7 +31,7 @@ '<(PRODUCT_DIR)/vie_auto_test<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarm_client/', + '../../tools/swarming_client/', ], }, }], diff --git a/video_engine/video_engine_core_unittests.isolate b/video_engine/video_engine_core_unittests.isolate index 717e79c6..941cbad4 100644 --- a/video_engine/video_engine_core_unittests.isolate +++ b/video_engine/video_engine_core_unittests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../testing/test_env.py', - '../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -29,7 +28,7 @@ '<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarm_client/', + '../../tools/swarming_client/', ], }, }], diff --git a/video_engine_tests.isolate b/video_engine_tests.isolate index 4108041d..f8934233 100644 --- a/video_engine_tests.isolate +++ b/video_engine_tests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../testing/test_env.py', - '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -33,7 +32,7 @@ '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../tools/swarm_client/', + '../tools/swarming_client/', ], }, }], diff --git a/voice_engine/voe_auto_test.isolate b/voice_engine/voe_auto_test.isolate index 11a3fd57..651d074e 100644 --- a/voice_engine/voe_auto_test.isolate +++ b/voice_engine/voe_auto_test.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../testing/test_env.py', - '../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -29,7 +28,7 @@ '<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarm_client/', + '../../tools/swarming_client/', ], }, }], diff --git a/voice_engine/voice_engine_unittests.isolate b/voice_engine/voice_engine_unittests.isolate index 49d8a3d6..c350bce8 100644 --- a/voice_engine/voice_engine_unittests.isolate +++ b/voice_engine/voice_engine_unittests.isolate @@ -21,7 +21,6 @@ 'variables': { 'command': [ '../../testing/test_env.py', - '../../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -29,7 +28,7 @@ '<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../../tools/swarm_client/', + '../../tools/swarming_client/', ], }, }], |