LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove CTS tests from runtest.py"

Browse Source
This commit is contained in:
Stuart Scott
2015-09-28 16:39:19 +00:00
committed by Android (Google) Code Review
parent 6366102188 be975e3911
commit ed4c4e800d
3 changed files with 0 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
testrunner/runtest.py
View File

@@ -446,13 +446,6 @@ class TestRunner(object):
self._tests_to_run.append(test)
return self._tests_to_run
def _IsCtsTests(self, test_list):
"""Check if any cts tests are included in given list of tests to run."""
for test in test_list:
if test.GetSuite() == 'cts':
return True
return False
def _TurnOffVerifier(self, test_list):
"""Turn off the dalvik verifier if needed by given tests.

186
testrunner/test_defs.xml
View File

@@ -227,186 +227,6 @@ See test_defs.xsd for more information.
class="android.content.ContentProviderOperationTest"
coverage_target="framework" />
<!-- cts tests -->
<test name="cts-permission"
build_path="cts/tests/tests/permission"
package="com.android.cts.permission"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
continuous="true"
suite="cts" />
<test name="cts-permission2"
build_path="cts/tests/tests/permission2"
package="com.android.cts.permission2"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
continuous="true"
suite="true" />
<test name="cts-process"
build_path="cts/tests/ProcessTest"
package="com.android.cts.process"
coverage_target="framework"
suite="cts" />
<test name="cts-security"
build_path="cts/tests/tests/security"
package="com.android.cts.security"
runner="android.support.test.runner.AndroidJUnitRunner"
suite="cts" />
<test name="cts-accounts"
build_path="cts/tests/tests/accounts"
package="android.accounts.cts"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-app"
build_path="cts/tests/tests/app"
package="com.android.cts.app"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-calllog"
build_path="cts/tests/tests/calllog"
package="com.android.cts.calllog"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="Phone"
suite="cts" />
<test name="cts-content"
build_path="cts/tests/tests/content"
package="com.android.cts.content"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-database"
build_path="cts/tests/tests/database"
package="com.android.cts.database"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-dreams"
build_path="cts/tests/tests/dreams"
package="com.android.cts.dreams"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-gesture"
build_path="cts/tests/tests/gesture"
package="com.android.cts.gesture"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-graphics"
build_path="cts/tests/tests/graphics"
package="com.android.cts.graphics"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-hardware"
build_path="cts/tests/tests/hardware"
package="com.android.cts.hardware"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
continuous="true"
suite="cts" />
<test name="cts-location"
build_path="cts/tests/tests/location"
package="com.android.cts.location"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-media"
build_path="cts/tests/tests/media"
package="com.android.cts.media"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-net"
build_path="cts/tests/tests/net"
package="com.android.cts.net"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-os"
build_path="cts/tests/tests/os"
package="com.android.cts.os"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-provider"
build_path="cts/tests/tests/provider"
package="com.android.cts.provider"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-text"
build_path="cts/tests/tests/text"
package="com.android.cts.text"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-telecom"
build_path="cts/tests/tests/telecom"
package="com.android.cts.telecom"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-telephony"
build_path="cts/tests/tests/telephony"
package="com.android.cts.telephony"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-util"
build_path="cts/tests/tests/util"
package="com.android.cts.util"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-view"
build_path="cts/tests/tests/view"
package="com.android.cts.view"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-webkit"
build_path="cts/tests/tests/webkit"
package="com.android.cts.webkit"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<test name="cts-widget"
build_path="cts/tests/tests/widget"
package="com.android.cts.widget"
runner="android.support.test.runner.AndroidJUnitRunner"
coverage_target="framework"
suite="cts" />
<!-- end of cts tests -->
<!-- selected app tests -->
<test name="apidemos"
build_path="development/samples/ApiDemos"
@@ -582,12 +402,6 @@ See test_defs.xsd for more information.
extra_build_args="LIBJINGLE_TESTS=1" />
<!-- host java tests -->
<test-host name="cts-appsecurity"
build_path="cts/hostsidetests/appsecurity"
class="com.android.cts.appsecurity.AppSecurityTests"
jar_name="CtsAppSecurityTests.jar"
suite="cts" />
<test-host name="frameworks-core-host"
build_path="frameworks/base/core/tests/hosttests"
class="android.content.pm.PackageManagerHostTests"

6
testrunner/test_defs/instrumentation_test.py
View File

@@ -273,12 +273,6 @@ class InstrumentationTestFactory(test_suite.AbstractTestFactory):
suite.SetName(pkg_name)
suite.SetClassName(class_name_arg)
suite.SetJavaPackageFilter(java_package_name)
# this is a bit of a hack, assume if 'com.android.cts' is in
# package name, this is a cts test
# this logic can be removed altogether when cts tests no longer require
# custom build steps
if suite.GetPackageName().startswith('com.android.cts'):
suite.SetSuite('cts')
tests.append(suite)
return tests