diff options
| -rw-r--r-- | Android.bp | 10 | ||||
| -rw-r--r-- | AndroidTest.xml | 15 | ||||
| -rw-r--r-- | AndroidTest_exhaustive_tests.xml | 15 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 24 | ||||
| -rwxr-xr-x | post_update.sh | 10 |
5 files changed, 1 insertions, 73 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --tests --dependencies --patch=patches/Android.bp.patch. +// This file is generated by cargo2android.py --run --device --tests --dependencies. rust_library { name: "libunicode_xid", @@ -27,10 +27,6 @@ rust_test_host { rust_test { name: "unicode-xid_device_test_src_lib", defaults: ["unicode-xid_defaults"], - // override the following properties to work with coverage tests - test_suites: ["device-tests"], - auto_gen_config: false, - test_config: "AndroidTest.xml", } rust_defaults { @@ -54,8 +50,4 @@ rust_test_host { rust_test { name: "unicode-xid_device_test_tests_exhaustive_tests", defaults: ["unicode-xid_defaults_exhaustive_tests"], - // override the following properties to work with coverage tests - test_suites: ["device-tests"], - auto_gen_config: false, - test_config: "AndroidTest_exhaustive_tests.xml", } diff --git a/AndroidTest.xml b/AndroidTest.xml deleted file mode 100644 index 47c0dd7..0000000 --- a/AndroidTest.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<configuration description="Config to run unicode-xid_device_test_src_lib device tests."> - - <option name="test-suite-tag" value="rust-tests" /> - - <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> - <option name="cleanup" value="true" /> - <option name="push" value="unicode-xid_device_test_src_lib->/data/local/tmp/unicode-xid_device_test_src_lib" /> - </target_preparer> - - <test class="com.android.tradefed.testtype.rust.RustBinaryTest" > - <option name="test-device-path" value="/data/local/tmp" /> - <option name="module-name" value="unicode-xid_device_test_src_lib" /> - </test> -</configuration> diff --git a/AndroidTest_exhaustive_tests.xml b/AndroidTest_exhaustive_tests.xml deleted file mode 100644 index 8ed58bb..0000000 --- a/AndroidTest_exhaustive_tests.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<configuration description="Config to run unicode-xid_device_test_tests_exhaustive_tests device tests."> - - <option name="test-suite-tag" value="rust-tests" /> - - <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> - <option name="cleanup" value="true" /> - <option name="push" value="unicode-xid_device_test_tests_exhaustive_tests->/data/local/tmp/unicode-xid_device_test_tests_exhaustive_tests" /> - </target_preparer> - - <test class="com.android.tradefed.testtype.rust.RustBinaryTest" > - <option name="test-device-path" value="/data/local/tmp" /> - <option name="module-name" value="unicode-xid_device_test_tests_exhaustive_tests" /> - </test> -</configuration> diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index d214303..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git b/Android.bp a/Android.bp -index b2cef8e..721b163 100644 ---- b/Android.bp -+++ a/Android.bp -@@ -29,6 +29,10 @@ rust_test_host { - rust_test { - name: "unicode-xid_device_test_src_lib", - defaults: ["unicode-xid_defaults"], -+ // override the following properties to work with coverage tests -+ test_suites: ["device-tests"], -+ auto_gen_config: false, -+ test_config: "AndroidTest.xml", - } - - rust_defaults { -@@ -53,4 +57,8 @@ rust_test_host { - rust_test { - name: "unicode-xid_device_test_tests_exhaustive_tests", - defaults: ["unicode-xid_defaults_exhaustive_tests"], -+ // override the following properties to work with coverage tests -+ test_suites: ["device-tests"], -+ auto_gen_config: false, -+ test_config: "AndroidTest_exhaustive_tests.xml", - } diff --git a/post_update.sh b/post_update.sh deleted file mode 100755 index 3a3ae24..0000000 --- a/post_update.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# $1 Path to the new version. -# $2 Path to the old version. - -set -x -set -e - -# copy old test xml config files. -cp -a -n $2/AndroidTest*.xml $1/ |