add a specialized test type for libcore CTS
Bug: 31015577
Bug: 31429663
Test: cts-tradefed run collect-tests-only \
--include-filter CtsLibcoreFileIOTestCases \
--include-filter CtsLibcoreLegacy22TestCases \
--include-filter CtsLibcoreOjTestCases \
--include-filter CtsLibcoreOkHttpTestCases \
--include-filter CtsLibcoreTestCases \
--include-filter CtsLibcoreJsr166TestCases
This dry-runs test modules to get test list; then the list is
compared with and without this change to verify that they are
identical (tests listed in expectation file should be excluded
in dry-run output).
Change-Id: Ib20ba58076d06dca92bce684ae4d6d24a99f887a
diff --git a/tests/libcore/jsr166/AndroidTest.xml b/tests/libcore/jsr166/AndroidTest.xml
index 33a4983..639f365 100644
--- a/tests/libcore/jsr166/AndroidTest.xml
+++ b/tests/libcore/jsr166/AndroidTest.xml
@@ -26,14 +26,16 @@
<!-- this has just the instrumentation which acts as the tests we want to run -->
<option name="test-file-name" value="CtsLibcoreJsr166TestCases.apk" />
</target_preparer>
- <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <test class="com.android.compatibility.testtype.LibcoreTest" >
<!-- override AJUR -->
<option name="runner" value="com.android.cts.core.runner.CoreTestRunner" />
<option name="package" value="android.libcore.cts.jsr166" />
<option name="instrumentation-arg" key="core-listener"
value="com.android.cts.runner.CtsTestRunListener"/>
- <option name="instrumentation-arg" key="core-expectations"
- value="/knownfailures.txt,/brokentests.txt,/icebox.txt,/taggedtests.txt" />
+ <option name="core-expectation" value="/knownfailures.txt" />
+ <option name="core-expectation" value="/brokentests.txt" />
+ <option name="core-expectation" value="/icebox.txt" />
+ <option name="core-expectation" value="/taggedtests.txt" />
<option name="runtime-hint" value="10m"/>
<!-- 20x default timeout of 600sec -->
<option name="shell-timeout" value="12000000"/>