Create isolate files for nonparallel tests.
Adds missing Android things for webrtc_nonparallel_tests.
BUG=chromium:445880
R=kjellander@webrtc.org
Review URL: https://codereview.webrtc.org/1419023003 .
Cr-Commit-Position: refs/heads/master@{#10451}
diff --git a/webrtc/build/android/test_runner.py b/webrtc/build/android/test_runner.py
index f78da57..7996982 100755
--- a/webrtc/build/android/test_runner.py
+++ b/webrtc/build/android/test_runner.py
@@ -52,6 +52,7 @@
'webrtc/video_engine/video_engine_core_unittests.isolate',
'voice_engine_unittests':
'webrtc/voice_engine/voice_engine_unittests.isolate',
+ 'webrtc_nonparallel_tests': 'webrtc/webrtc_nonparallel_tests.isolate',
'webrtc_perf_tests': 'webrtc/webrtc_perf_tests.isolate',
})
# Override environment variable to make it possible for the scripts to find
diff --git a/webrtc/build/apk_tests_noop.gyp b/webrtc/build/apk_tests_noop.gyp
index 9a4789f..719bddb 100644
--- a/webrtc/build/apk_tests_noop.gyp
+++ b/webrtc/build/apk_tests_noop.gyp
@@ -58,6 +58,10 @@
'type': 'none',
},
{
+ 'target_name': 'webrtc_nonparallel_tests_apk',
+ 'type': 'none',
+ },
+ {
'target_name': 'webrtc_perf_tests_apk',
'type': 'none',
},
diff --git a/webrtc/webrtc_nonparallel_tests.isolate b/webrtc/webrtc_nonparallel_tests.isolate
new file mode 100644
index 0000000..0e13d7b
--- /dev/null
+++ b/webrtc/webrtc_nonparallel_tests.isolate
@@ -0,0 +1,21 @@
+# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS. All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+{
+ 'conditions': [
+ ['OS=="linux" or OS=="mac" or OS=="win"', {
+ 'variables': {
+ 'command': [
+ '<(PRODUCT_DIR)/webrtc_nonparallel_tests<(EXECUTABLE_SUFFIX)',
+ ],
+ 'files': [
+ '<(PRODUCT_DIR)/webrtc_nonparallel_tests<(EXECUTABLE_SUFFIX)',
+ ],
+ },
+ }],
+ ],
+}
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index 547b99b..811bbd7 100644
--- a/webrtc/webrtc_tests.gypi
+++ b/webrtc/webrtc_tests.gypi
@@ -347,6 +347,19 @@
],
},
{
+ 'target_name': 'webrtc_nonparallel_tests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'webrtc_nonparallel_tests',
+ ],
+ 'includes': [
+ 'build/isolate.gypi',
+ ],
+ 'sources': [
+ 'webrtc_nonparallel_tests.isolate',
+ ],
+ },
+ {
'target_name': 'webrtc_perf_tests_run',
'type': 'none',
'dependencies': [
