Migrate to run the new CtsIcu4cTestCases in presubmit - Attempt 2
CtsIcu4cTestCases contains both cintltst and intltest, and thus we can
just run CtsIcu4cTestCases.
Bug: 160350521
Test: atest CtsIcu4cTestCases
Change-Id: If693f902c662846d9e2d35ac4abefbecb440d220
diff --git a/TEST_MAPPING b/TEST_MAPPING
index f476372..de82f9f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,10 +1,7 @@
{
"presubmit": [
{
- "name": "intltest_test"
- },
- {
- "name": "cintltst_test"
+ "name": "CtsIcu4cTestCases"
},
{
"name": "minikin_tests"
diff --git a/icu4c/source/test/cintltst/Android.bp b/icu4c/source/test/cintltst/Android.bp
index 007f0b6..450be4d 100644
--- a/icu4c/source/test/cintltst/Android.bp
+++ b/icu4c/source/test/cintltst/Android.bp
@@ -37,14 +37,3 @@
// dependencies with a single variant
compile_multilib: "first",
}
-
-java_test_host {
- name: "cintltst_test",
- data: [
- ":cintltst",
- ":icu4c_test_data",
- ":ICU4CTestRunner",
- ],
- test_config: "AndroidTest.xml",
- test_suites: ["device-tests"],
-}
diff --git a/icu4c/source/test/cintltst/AndroidTest.xml b/icu4c/source/test/cintltst/AndroidTest.xml
deleted file mode 100644
index 9b01f74..0000000
--- a/icu4c/source/test/cintltst/AndroidTest.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="Config for CTS ICU4C test cases">
- <option name="test-suite-tag" value="apct" />
- <option name="config-descriptor:metadata" key="component" value="icu4c" />
- <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
- <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
- <option name="cleanup" value="true" />
- <option name="push" value="icu.cintltst->/data/local/tmp/cintltst_test" />
- </target_preparer>
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
- <option name="cleanup" value="true" />
- <option name="push" value="icu4c_test_data.zip->/data/local/tmp/icu4c_test_data.zip" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="run-command" value="mkdir -p /data/local/tmp/test/testdata && unzip -o -d /data/local/tmp/test/testdata /data/local/tmp/icu4c_test_data.zip" />
- <option name="teardown-command" value="rm -r /data/local/tmp/test/testdata" />
- </target_preparer>
-
- <test class="com.android.tradefed.testtype.HostTest" >
- <option name="jar" value="ICU4CTestRunner.jar" />
- <option name="set-option" value="module-name:cintltst_test" />
- <option name="set-option" value="runtime-hint:20s" />
- <option name="set-option" value="no-fail-data-errors:true" />
- <option name="set-option" value="native-test-timeout:300000" />
- <option name="set-option" value="command-filter-prefix:/" />
- <!-- Sample include-filter to run a subset of tests in putiltst-->
- <!-- <option name="set-option" value="include-filter:cintltst.putiltst" /> -->
- </test>
-</configuration>
diff --git a/icu4c/source/test/intltest/Android.bp b/icu4c/source/test/intltest/Android.bp
index af8fe17..c0b261f 100644
--- a/icu4c/source/test/intltest/Android.bp
+++ b/icu4c/source/test/intltest/Android.bp
@@ -37,14 +37,3 @@
// dependencies with a single variant
compile_multilib: "first",
}
-
-java_test_host {
- name: "intltest_test",
- data: [
- ":intltest",
- ":icu4c_test_data",
- ":ICU4CTestRunner",
- ],
- test_config: "AndroidTest.xml",
- test_suites: ["device-tests"],
-}
diff --git a/icu4c/source/test/intltest/AndroidTest.xml b/icu4c/source/test/intltest/AndroidTest.xml
deleted file mode 100644
index c0a541b..0000000
--- a/icu4c/source/test/intltest/AndroidTest.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="Config for ICU4C intltest">
- <option name="test-suite-tag" value="apct" />
- <option name="config-descriptor:metadata" key="component" value="icu4c" />
- <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
- <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
- <option name="cleanup" value="true" />
- <option name="push" value="icu.intltest->/data/local/tmp/intltest_test" />
- </target_preparer>
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
- <option name="cleanup" value="true" />
- <option name="push" value="icu4c_test_data.zip->/data/local/tmp/icu4c_test_data.zip" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="run-command" value="mkdir -p /data/local/tmp/test/testdata && unzip -o -d /data/local/tmp/test/testdata /data/local/tmp/icu4c_test_data.zip" />
- <option name="teardown-command" value="rm -r /data/local/tmp/test/testdata" />
- </target_preparer>
-
- <test class="com.android.tradefed.testtype.HostTest" >
- <option name="jar" value="ICU4CTestRunner.jar" />
- <option name="set-option" value="module-name:intltest_test" />
- <option name="set-option" value="runtime-hint:1m30s" />
- <option name="set-option" value="no-fail-data-errors:true" />
- <!-- test-timeout unit is ms, value = 10 minutes -->
- <option name="set-option" value="native-test-timeout:600000" />
- <!-- Sample include-filter to run a subset of tests in utility-->
- <!-- <option name="set-option" value="include-filter:intltest.utility" /> -->
- </test>
-
-</configuration>