diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2021-10-19 18:29:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-19 18:29:15 +0000 |
| commit | 2d606c7084423b6ef73fbed3cf76f4d449501345 (patch) | |
| tree | ca6304f83cf1a9b13037019d84b52f00b2796ea2 | |
| parent | 7d3d5560e5e3671ffa5dcb27f42326e0358a67aa (diff) | |
| parent | 2ca423151a9a3554f89a144feae1f500f258aef4 (diff) | |
| download | num_cpus-2d606c7084423b6ef73fbed3cf76f4d449501345.tar.gz | |
Enable tests am: f538b4ee8a am: b50e06f6b3 am: 5f0d1e6db9 am: bdb2d14dd7 am: 2ca423151a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num_cpus/+/1862635
Change-Id: Ia1dc328305fb010cefb547c1ce47c27ec50a1e9c
| -rw-r--r-- | Android.bp | 22 | ||||
| -rw-r--r-- | TEST_MAPPING | 15 | ||||
| -rw-r--r-- | cargo2android.json | 5 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 19 |
4 files changed, 48 insertions, 13 deletions
@@ -41,6 +41,8 @@ rust_library { name: "libnum_cpus", host_supported: true, crate_name: "num_cpus", + cargo_env_compat: true, + cargo_pkg_version: "1.13.0", srcs: ["src/lib.rs"], edition: "2015", rustlibs: [ @@ -54,5 +56,21 @@ rust_library { min_sdk_version: "29", } -// dependent_library ["feature_list"] -// libc-0.2.94 "default,std" +rust_defaults { + name: "num_cpus_test_defaults", + crate_name: "num_cpus", + srcs: ["src/lib.rs"], + cargo_env_compat: true, + cargo_pkg_version: "1.13.0", + test_suites: ["general-tests"], + auto_gen_config: true, + edition: "2015", + rustlibs: [ + "liblibc", + ], +} + +rust_test { + name: "num_cpus_device_test_src_lib", + defaults: ["num_cpus_test_defaults"], +} diff --git a/TEST_MAPPING b/TEST_MAPPING index 510a953..cfe14cc 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,9 +2,6 @@ { "presubmit": [ { - "name": "ZipFuseTest" - }, - { "name": "anyhow_device_test_src_lib" }, { @@ -41,9 +38,6 @@ "name": "anyhow_device_test_tests_test_source" }, { - "name": "authfs_device_test_src_lib" - }, - { "name": "base64_device_test_tests_decode" }, { @@ -59,9 +53,15 @@ "name": "futures-util_device_test_src_lib" }, { + "name": "grpcio_device_test_src_lib" + }, + { "name": "keystore2_selinux_concurrency_test" }, { + "name": "num_cpus_device_test_src_lib" + }, + { "name": "tokio-test_device_test_src_lib" }, { @@ -273,9 +273,6 @@ }, { "name": "unicode-xid_device_test_tests_exhaustive_tests" - }, - { - "name": "virtualizationservice_device_test" } ] } diff --git a/cargo2android.json b/cargo2android.json index 01465d0..f72af5e 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -7,5 +7,6 @@ "min_sdk_version": "29", "dependencies": true, "device": true, - "run": true -}
\ No newline at end of file + "run": true, + "tests": true +} diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..cb85884 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,19 @@ +diff --git a/Android.bp b/Android.bp +index a441683..8f89a16 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -70,14 +70,6 @@ rust_defaults { + ], + } + +-rust_test_host { +- name: "num_cpus_host_test_src_lib", +- defaults: ["num_cpus_test_defaults"], +- test_options: { +- unit_test: true, +- }, +-} +- + rust_test { + name: "num_cpus_device_test_src_lib", + defaults: ["num_cpus_test_defaults"], |