diff options
| author | Dan Zhang <danielzhang@google.com> | 2014-10-24 16:50:22 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-10-27 20:29:31 -0700 |
| commit | d3a14383a380043c6b799ac0df7033c6e5c7972d (patch) | |
| tree | d02db0d7468f9f776ca923c1d5036913a5204e04 | |
| parent | cc0740bfa7c0646bdef00ead54922cbb32e8f242 (diff) | |
| download | platform_cts-d3a14383a380043c6b799ac0df7033c6e5c7972d.tar.gz platform_cts-d3a14383a380043c6b799ac0df7033c6e5c7972d.tar.bz2 platform_cts-d3a14383a380043c6b799ac0df7033c6e5c7972d.zip | |
Commented out these tests in initial L release due to stability and user friendliness. Goal is to release in L-MR1:
Sensor Power
Step Counter and Detector Tests
Bug: 18038871
Change-Id: I907bbd053bfb18b94b08245d13229aed6d23cdfc
| -rw-r--r-- | apps/CtsVerifier/Android.mk | 19 | ||||
| -rw-r--r-- | apps/CtsVerifier/AndroidManifest.xml | 9 |
2 files changed, 16 insertions, 12 deletions
diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk index 34bc230fb1f..460b88aeadf 100644 --- a/apps/CtsVerifier/Android.mk +++ b/apps/CtsVerifier/Android.mk @@ -61,17 +61,18 @@ verifier-dir := $(cts-dir)/$(verifier-dir-name) verifier-zip-name := $(verifier-dir-name).zip verifier-zip := $(cts-dir)/$(verifier-zip-name) -$(PRODUCT_OUT)/data/app/CtsVerifier.apk $(verifier-zip): $(verifier-dir)/power/execute_power_tests.py -$(PRODUCT_OUT)/data/app/CtsVerifier.apk $(verifier-zip): $(verifier-dir)/power/power_monitors/monsoon.py +# turned off sensor power tests in initial L release +#$(PRODUCT_OUT)/data/app/CtsVerifier.apk $(verifier-zip): $(verifier-dir)/power/execute_power_tests.py +#$(PRODUCT_OUT)/data/app/CtsVerifier.apk $(verifier-zip): $(verifier-dir)/power/power_monitors/monsoon.py # Copy the necessary host-side scripts to include in the zip file: -$(verifier-dir)/power/power_monitors/monsoon.py: cts/apps/CtsVerifier/assets/scripts/power_monitors/monsoon.py | $(ACP) - $(hide) mkdir -p $(verifier-dir)/power/power_monitors - $(hide) $(ACP) -fp cts/apps/CtsVerifier/assets/scripts/power_monitors/*.py $(verifier-dir)/power/power_monitors/. - -$(verifier-dir)/power/execute_power_tests.py: cts/apps/CtsVerifier/assets/scripts/execute_power_tests.py | $(ACP) - $(hide) mkdir -p $(verifier-dir)/power - $(hide) $(ACP) -fp cts/apps/CtsVerifier/assets/scripts/execute_power_tests.py $@ +#$(verifier-dir)/power/power_monitors/monsoon.py: cts/apps/CtsVerifier/assets/scripts/power_monitors/monsoon.py | $(ACP) +# $(hide) mkdir -p $(verifier-dir)/power/power_monitors +# $(hide) $(ACP) -fp cts/apps/CtsVerifier/assets/scripts/power_monitors/*.py $(verifier-dir)/power/power_monitors/. +# +#$(verifier-dir)/power/execute_power_tests.py: cts/apps/CtsVerifier/assets/scripts/execute_power_tests.py | $(ACP) +# $(hide) mkdir -p $(verifier-dir)/power +# $(hide) $(ACP) -fp cts/apps/CtsVerifier/assets/scripts/execute_power_tests.py $@ cts : $(verifier-zip) ifeq ($(HOST_OS),linux) diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml index 106611c9125..a5c2a22c9ef 100644 --- a/apps/CtsVerifier/AndroidManifest.xml +++ b/apps/CtsVerifier/AndroidManifest.xml @@ -977,7 +977,7 @@ <meta-data android:name="test_category" android:value="@string/test_category_hardware" /> <meta-data android:name="test_required_features" android:value="android.hardware.usb.accessory" /> </activity> - +<!-- Turned off Sensor Power Test in initial L release <activity android:name=".sensors.SensorPowerTestActivity" android:label="@string/sensor_power_test" android:configChanges="keyboardHidden|orientation|screenSize"> @@ -989,7 +989,7 @@ <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback" /> </activity> - +--> <activity android:name=".p2p.P2pTestListActivity" android:label="@string/p2p_test" android:configChanges="keyboardHidden|orientation|screenSize"> @@ -1118,6 +1118,9 @@ <meta-data android:name="test_category" android:value="@string/test_category_deskclock" /> </activity> +<!-- TODO: enable when not requiring to tap the screen and timeouts are tuned --> +<!-- Removed from initial L release + <activity android:name="com.android.cts.verifier.sensors.StepCounterTestActivity" android:label="@string/snsr_step_counter_test" @@ -1130,7 +1133,7 @@ <meta-data android:name="test_excluded_features" android:value="android.hardware.type.television:android.software.leanback" /> </activity> - +--> <activity android:name="com.android.cts.verifier.sensors.SignificantMotionTestActivity" android:label="@string/snsr_significant_motion_test" |