cheets_CTS_R: Add decoder-performance subjob for CtsMediaTestCases.
For quickly iterating the performance measurement without
affected by the stability of whole CtsMediaTestCases.
Aside that, this CL adds the CtsMedia sub tests to the
"arc-cts" suite. "arc-cts-r" was used only for devices
at testing stage of R, but the subtests are useful for
launched devices as well.
BUG=b:192030397
TEST=cheets_CTS_R.arm.CtsMediaTestCases.perf
Change-Id: Ia313579f65be45315acb5b3e4feb59abb5782f50
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2986069
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Chih-Yu Huang <akahuang@chromium.org>
Reviewed-by: Chih-Yu Huang <akahuang@chromium.org>
diff --git a/server/cros/tradefed/generate_controlfiles_CTS_R.py b/server/cros/tradefed/generate_controlfiles_CTS_R.py
index 8c536d9..3720708 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_R.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_R.py
@@ -152,6 +152,7 @@
CONFIG['NEEDS_PUSH_MEDIA'] = CONFIG['MEDIA_MODULES'] + [
'CtsMediaTestCases.audio',
+ 'CtsMediaTestCases.perf',
'CtsMediaTestCases.video',
]
@@ -273,14 +274,17 @@
'SUITES': ['suite:arc-cts-r'],
},
'CtsMediaTestCases': {
- 'SUBMODULES': set([
+ 'SUBMODULES':
+ set([
'CtsMediaTestCases.audio',
+ 'CtsMediaTestCases.perf',
'CtsMediaTestCases.video',
]),
- 'SUITES': ['suite:arc-cts-r'],
+ 'SUITES': ['suite:arc-cts-r', 'suite:arc-cts'],
},
'CtsWindowManagerDeviceTestCases': {
- 'SUBMODULES': set([
+ 'SUBMODULES':
+ set([
'CtsWindowManager.A',
'CtsWindowManager.C',
'CtsWindowManager.D',
@@ -571,231 +575,235 @@
'--include-filter',
'CtsMediaTestCases android.media.cts.VolumeShaperTest',
],
+ 'CtsMediaTestCases.perf': [
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest',
+ ],
'CtsMediaTestCases.video': [
- '--include-filter',
- 'CtsMediaTestCases android.media.cts.AdaptivePlaybackTest',
- '--include-filter',
- 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest',
- '--include-filter',
- 'CtsMediaTestCases android.media.cts.DecodeEditEncodeTest',
- '--include-filter',
- 'CtsMediaTestCases android.media.cts.DecoderConformanceTest',
- '--include-filter',
- 'CtsMediaTestCases android.media.cts.EncodeDecodeTest',
- '--include-filter',
- 'CtsMediaTestCases android.media.cts.ExtractDecodeEditEncodeMuxTest',
- '--include-filter',
- 'CtsMediaTestCases android.media.cts.MediaCodecPlayerTest',
- '--include-filter',
- 'CtsMediaTestCases android.media.cts.MediaCodecPlayerTest',
- '--include-filter',
- 'CtsMediaTestCases android.media.cts.MediaDrmClearkeyTest',
- '--include-filter',
- 'CtsMediaTestCases android.media.cts.MediaRecorderTest',
- '--include-filter',
- 'CtsMediaTestCases android.media.cts.MediaSynctest#testPlayVideo',
- '--include-filter',
- 'CtsMediaTestCases android.media.cts.VideoCodecTest',
- '--include-filter',
- 'CtsMediaTestCases android.media.cts.VideoEncoderTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.AdaptivePlaybackTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.DecodeEditEncodeTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.DecoderConformanceTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.EncodeDecodeTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.ExtractDecodeEditEncodeMuxTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.MediaCodecPlayerTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.MediaCodecPlayerTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.MediaDrmClearkeyTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.MediaRecorderTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.MediaSynctest#testPlayVideo',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.VideoCodecTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.VideoEncoderTest',
],
'CtsWindowManager.A': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.ActivityManagerGetConfigTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.ActivityMetricsLoggerTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.ActivityTaskAffinityTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.ActivityTransitionTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.ActivityViewTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.ActivityVisibilityTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.AddWindowAsUserTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.AlertWindowsAppOpsTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.AlertWindowsImportanceTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.AlertWindowsTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.AmProfileTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.AmStartOptionsTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.AnrTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.AppConfigurationTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.AspectRatioTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.AssistantStackTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.ActivityManagerGetConfigTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.ActivityMetricsLoggerTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.ActivityTaskAffinityTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.ActivityTransitionTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.ActivityViewTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.ActivityVisibilityTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.AddWindowAsUserTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.AlertWindowsAppOpsTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.AlertWindowsImportanceTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.AlertWindowsTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.AmProfileTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.AmStartOptionsTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.AnrTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.AppConfigurationTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.AspectRatioTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.AssistantStackTests',
],
'CtsWindowManager.C': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.CloseOnOutsideTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.ConfigChangeTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.CrossAppDragAndDropTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.CloseOnOutsideTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.ConfigChangeTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.CrossAppDragAndDropTests',
],
'CtsWindowManager.D': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.DecorInsetTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.DeprecatedTargetSdkTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.DialogFrameTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.DisplayCutoutTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.DisplaySizeTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.DisplayTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.DragDropTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.DreamManagerServiceTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.DecorInsetTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.DeprecatedTargetSdkTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.DialogFrameTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.DisplayCutoutTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.DisplaySizeTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.DisplayTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.DragDropTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.DreamManagerServiceTests',
],
'CtsWindowManager.F': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.ForceRelayoutTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.FreeformWindowingModeTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.ForceRelayoutTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.FreeformWindowingModeTests',
],
'CtsWindowManager.L': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.LayoutTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.LocationInWindowTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.LocationOnScreenTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.LayoutTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.LocationInWindowTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.LocationOnScreenTests',
],
'CtsWindowManager.M': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.ManifestLayoutTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.MinimalPostProcessingTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplayActivityLaunchTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplayClientTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplayKeyguardTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplayLockedKeyguardTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplayPolicyTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplayPrivateDisplayTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplaySecurityTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplaySystemDecorationTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.ManifestLayoutTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.MinimalPostProcessingTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplayActivityLaunchTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplayClientTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplayKeyguardTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplayLockedKeyguardTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplayPolicyTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplayPrivateDisplayTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplaySecurityTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.MultiDisplaySystemDecorationTests',
],
'CtsWindowManager.Override': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.OverrideConfigTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.OverrideConfigTests',
],
'CtsWindowManager.P': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.PinnedStackTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.PrereleaseSdkTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.PresentationTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.PinnedStackTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.PrereleaseSdkTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.PresentationTest',
],
'CtsWindowManager.R': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.ReplaceWindowTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.RobustnessTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.ReplaceWindowTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.RobustnessTests',
],
'CtsWindowManager.S': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.SplashscreenTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.SplitScreenTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.StartActivityAsUserTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.StartActivityTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.SurfaceControlTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.SurfaceControlViewHostTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.SurfaceViewSurfaceValidatorTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.SurfaceViewTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.SplashscreenTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.SplitScreenTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.StartActivityAsUserTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.StartActivityTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.SurfaceControlTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.SurfaceControlViewHostTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.SurfaceViewSurfaceValidatorTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.SurfaceViewTest',
],
'CtsWindowManager.T': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.ToastWindowTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.TransitionSelectionTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.ToastWindowTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.TransitionSelectionTests',
],
'CtsWindowManager.Window': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowContextPolicyTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowContextTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowFocusTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInputTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationCallbackTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationControllerTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationImeTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationSynchronicityTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsControllerTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsLayoutTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsPolicyTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowManager_BadTokenExceptionTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowManager_LayoutParamsTest',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowMetricsTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.WindowTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowContextPolicyTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowContextTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowFocusTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInputTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationCallbackTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationControllerTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationImeTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationSynchronicityTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsControllerTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsLayoutTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsPolicyTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowManager_BadTokenExceptionTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowManager_LayoutParamsTest',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowMetricsTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.WindowTest',
],
'CtsWindowManager.intent': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.intent.IntentGenerationTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.intent.IntentTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.intent.IntentGenerationTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.intent.IntentTests',
],
'CtsWindowManager.lifecycle': [
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityLifecycleFreeformTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityLifecycleKeyguardTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityLifecyclePipTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityLifecycleSplitScreenTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityLifecycleTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityLifecycleTopResumedStateTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityStarterTests',
- '--include-filter',
- 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityLifecycleFreeformTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityLifecycleKeyguardTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityLifecyclePipTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityLifecycleSplitScreenTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityLifecycleTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityLifecycleTopResumedStateTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityStarterTests',
+ '--include-filter',
+ 'CtsWindowManagerDeviceTestCases android.server.wm.lifecycle.ActivityTests',
],
}
diff --git a/server/site_tests/cheets_CTS_R/control.11_r4.arm.CtsMediaTestCases.audio b/server/site_tests/cheets_CTS_R/control.11_r4.arm.CtsMediaTestCases.audio
index c9edc54..aa71d9e 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r4.arm.CtsMediaTestCases.audio
+++ b/server/site_tests/cheets_CTS_R/control.11_r4.arm.CtsMediaTestCases.audio
@@ -6,7 +6,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_R.11_r4.arm.CtsMediaTestCases.audio'
-ATTRIBUTES = 'suite:arc-cts-r'
+ATTRIBUTES = 'suite:arc-cts-r, suite:arc-cts'
DEPENDENCIES = 'arc'
JOB_RETRIES = 1
TEST_TYPE = 'server'
diff --git a/server/site_tests/cheets_CTS_R/control.11_r4.arm.CtsMediaTestCases.perf b/server/site_tests/cheets_CTS_R/control.11_r4.arm.CtsMediaTestCases.perf
new file mode 100644
index 0000000..ed62c9b
--- /dev/null
+++ b/server/site_tests/cheets_CTS_R/control.11_r4.arm.CtsMediaTestCases.perf
@@ -0,0 +1,35 @@
+# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_CTS_R.11_r4.arm.CtsMediaTestCases.perf'
+ATTRIBUTES = 'suite:arc-cts-r, suite:arc-cts'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 1
+TEST_TYPE = 'server'
+TIME = 'MEDIUM'
+MAX_RESULT_SIZE_KB = 512000
+DOC = 'Run module CtsMediaTestCases.perf of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
+
+def run_TS(machine):
+ host_list = [hosts.create_host(machine)]
+ job.run_test(
+ 'cheets_CTS_R',
+ hosts=host_list,
+ iterations=1,
+ needs_push_media=True,
+ tag='11_r4.arm.CtsMediaTestCases.perf',
+ test_name='cheets_CTS_R.11_r4.arm.CtsMediaTestCases.perf',
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ target_module='CtsMediaTestCases',
+ target_plan=None,
+ bundle='arm',
+ uri='LATEST',
+ use_jdk9=True,
+ timeout=3600)
+
+parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_R/control.11_r4.arm.CtsMediaTestCases.video b/server/site_tests/cheets_CTS_R/control.11_r4.arm.CtsMediaTestCases.video
index 6a79f24..b5ac3dd 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r4.arm.CtsMediaTestCases.video
+++ b/server/site_tests/cheets_CTS_R/control.11_r4.arm.CtsMediaTestCases.video
@@ -6,7 +6,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_R.11_r4.arm.CtsMediaTestCases.video'
-ATTRIBUTES = 'suite:arc-cts-r'
+ATTRIBUTES = 'suite:arc-cts-r, suite:arc-cts'
DEPENDENCIES = 'arc'
JOB_RETRIES = 1
TEST_TYPE = 'server'
diff --git a/server/site_tests/cheets_CTS_R/control.11_r4.x86.CtsMediaTestCases.audio b/server/site_tests/cheets_CTS_R/control.11_r4.x86.CtsMediaTestCases.audio
index 8ec8171..e0fba9d 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r4.x86.CtsMediaTestCases.audio
+++ b/server/site_tests/cheets_CTS_R/control.11_r4.x86.CtsMediaTestCases.audio
@@ -6,7 +6,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_R.11_r4.x86.CtsMediaTestCases.audio'
-ATTRIBUTES = 'suite:arc-cts-r'
+ATTRIBUTES = 'suite:arc-cts-r, suite:arc-cts'
DEPENDENCIES = 'arc, cts_abi_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
diff --git a/server/site_tests/cheets_CTS_R/control.11_r4.x86.CtsMediaTestCases.perf b/server/site_tests/cheets_CTS_R/control.11_r4.x86.CtsMediaTestCases.perf
new file mode 100644
index 0000000..182d36e
--- /dev/null
+++ b/server/site_tests/cheets_CTS_R/control.11_r4.x86.CtsMediaTestCases.perf
@@ -0,0 +1,35 @@
+# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_CTS_R.11_r4.x86.CtsMediaTestCases.perf'
+ATTRIBUTES = 'suite:arc-cts-r, suite:arc-cts'
+DEPENDENCIES = 'arc, cts_abi_x86'
+JOB_RETRIES = 1
+TEST_TYPE = 'server'
+TIME = 'MEDIUM'
+MAX_RESULT_SIZE_KB = 512000
+DOC = 'Run module CtsMediaTestCases.perf of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
+
+def run_TS(machine):
+ host_list = [hosts.create_host(machine)]
+ job.run_test(
+ 'cheets_CTS_R',
+ hosts=host_list,
+ iterations=1,
+ needs_push_media=True,
+ tag='11_r4.x86.CtsMediaTestCases.perf',
+ test_name='cheets_CTS_R.11_r4.x86.CtsMediaTestCases.perf',
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ target_module='CtsMediaTestCases',
+ target_plan=None,
+ bundle='x86',
+ uri='LATEST',
+ use_jdk9=True,
+ timeout=3600)
+
+parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_R/control.11_r4.x86.CtsMediaTestCases.video b/server/site_tests/cheets_CTS_R/control.11_r4.x86.CtsMediaTestCases.video
index 9f387c9..7045e3a 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r4.x86.CtsMediaTestCases.video
+++ b/server/site_tests/cheets_CTS_R/control.11_r4.x86.CtsMediaTestCases.video
@@ -6,7 +6,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_R.11_r4.x86.CtsMediaTestCases.video'
-ATTRIBUTES = 'suite:arc-cts-r'
+ATTRIBUTES = 'suite:arc-cts-r, suite:arc-cts'
DEPENDENCIES = 'arc, cts_abi_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
