diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-10 08:37:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 08:37:24 +0000 |
| commit | be3c7b5e56569856352f4a400c703958fb8baaa4 (patch) | |
| tree | 8e7364c36de06ce03f24af0c58d9856c417c3ba2 | |
| parent | 19df97df2fcd8c902a45236aa6315be986fed0a8 (diff) | |
| parent | 0bce29a225c56cd8d5c896450ea84065f0cf0b6a (diff) | |
| download | libtextclassifier-be3c7b5e56569856352f4a400c703958fb8baaa4.tar.gz | |
Merge "Set up libtextclassifier_tests into MTS" into rvc-dev am: 0bce29a225
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libtextclassifier/+/11685296
Change-Id: Ic83d9f8b196e014dad91e5fc076bf4927a6a706f
| -rw-r--r-- | native/Android.bp | 4 | ||||
| -rw-r--r-- | native/AndroidTest.xml | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/native/Android.bp b/native/Android.bp index 4260525..9a79285 100644 --- a/native/Android.bp +++ b/native/Android.bp @@ -323,7 +323,7 @@ cc_test { name: "libtextclassifier_tests", defaults: ["libtextclassifier_defaults"], - test_suites: ["device-tests"], + test_suites: ["device-tests", "mts"], data: [ "annotator/test_data/**/*", @@ -339,9 +339,11 @@ cc_test { multilib: { lib32: { + suffix: "32", cppflags: ["-DTC3_TEST_DATA_DIR=\"/data/nativetest/libtextclassifier_tests/test_data/\""], }, lib64: { + suffix: "64", cppflags: ["-DTC3_TEST_DATA_DIR=\"/data/nativetest64/libtextclassifier_tests/test_data/\""], }, }, diff --git a/native/AndroidTest.xml b/native/AndroidTest.xml index fd0c609..cee26dd 100644 --- a/native/AndroidTest.xml +++ b/native/AndroidTest.xml @@ -14,13 +14,21 @@ limitations under the License. --> <configuration description="Config for libtextclassifier_tests"> - <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="mts" /> + + <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> <option name="cleanup" value="true" /> <option name="push" value="libtextclassifier_tests->/data/local/tmp/libtextclassifier_tests" /> + <option name="append-bitness" value="true" /> </target_preparer> - <option name="test-suite-tag" value="apct" /> + <test class="com.android.tradefed.testtype.GTest" > <option name="native-test-device-path" value="/data/local/tmp" /> <option name="module-name" value="libtextclassifier_tests" /> </test> + + <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController"> + <option name="mainline-module-package-name" value="com.google.android.extservices" /> + </object> </configuration> |