summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-06 20:30:51 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-06 20:30:51 +0000
commitfd83b2c2eb302e86ed8c316315d52f4f1be9edab (patch)
tree1b4ae4f529a0fc3408fb8b65166090d4ff02e329
parent7db7752e973015840671ae709067f16b0b862f71 (diff)
parent101ca101f9adfa469b2c84b5456f8ee0f2537a4b (diff)
downloadcatbox-android14-mainline-permission-release.tar.gz
Snap for 11028996 from 101ca101f9adfa469b2c84b5456f8ee0f2537a4b to mainline-permission-releaseaml_per_341510010aml_per_341410020aml_per_341311000android14-mainline-permission-release
Change-Id: Ibf410eba8cc0d18d13961ae77950433c7ab7c545
-rw-r--r--tools/catbox-common/res/config/catbox-performance-multiuser-base.xml12
1 files changed, 0 insertions, 12 deletions
diff --git a/tools/catbox-common/res/config/catbox-performance-multiuser-base.xml b/tools/catbox-common/res/config/catbox-performance-multiuser-base.xml
index efb6131..2929ac9 100644
--- a/tools/catbox-common/res/config/catbox-performance-multiuser-base.xml
+++ b/tools/catbox-common/res/config/catbox-performance-multiuser-base.xml
@@ -17,24 +17,12 @@
<configuration description="Base config for Multi-User latency metrics">
<include name="catbox-performance-base" />
- <!-- Skip the test if skip conditions are met -->
- <target_preparer class="com.android.catbox.targetpreparer.SkipTestPreparer">
- <option name="comp-property" value="ro.build.version.sdk"/>
- <option name="comp-property-int-value" value="33"/>
- <option name="int-comparison-operator" value="lt"/>
- </target_preparer>
-
<!-- TradeFed test harness -->
<option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:runner:androidx.test.runner.AndroidJUnitRunner" />
<option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:package:android.platform.scenario.multiuser" />
<option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:no-rerun:true" />
<option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:shell-timeout:1000000" />
- <!-- Switch to User 0 and wait for a some time (milliseconds) until system idle -->
- <target_preparer class="com.android.tradefed.targetprep.SwitchUserTargetPreparer" >
- <option name="user-type" value="SYSTEM" />
- </target_preparer>
-
<option name="compatibility:test-arg" value="com.android.tradefed.targetprep.TimeWaster:delay:20000" />
<option name="compatibility:module-arg" value="AndroidAutomotiveMultiuserScenarioTests:instrumentation-arg:iterations:=5" />