diff options
author | Joel Galenson <jgalenson@google.com> | 2021-11-29 14:03:28 -0800 |
---|---|---|
committer | Joel Galenson <jgalenson@google.com> | 2021-12-10 15:32:36 -0800 |
commit | b8b08bb6ccde2099a91747ee6c22dce9a413b008 (patch) | |
tree | 60f1b582b960b9d6f32bf9df88e2ea5a193fd09a | |
parent | f78f73ccf47b9f64cb8ee11120601f25e5a91ba1 (diff) | |
download | crossbeam-queue-b8b08bb6ccde2099a91747ee6c22dce9a413b008.tar.gz |
Refresh Android.bp, cargo2android.json, TEST_MAPPING.
Test: None
Change-Id: Iea2313f98b42b2b58dbdbfb37c7b24bb46899ee6
-rw-r--r-- | Android.bp | 56 | ||||
-rw-r--r-- | TEST_MAPPING | 21 |
2 files changed, 19 insertions, 58 deletions
@@ -42,7 +42,6 @@ license { rust_defaults { name: "crossbeam-queue_test_defaults", crate_name: "crossbeam_queue", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "0.3.2", test_suites: ["general-tests"], @@ -55,48 +54,16 @@ rust_defaults { ], rustlibs: [ "libcfg_if", + "libcrossbeam_queue", "libcrossbeam_utils", "librand", ], } -rust_test_host { - name: "crossbeam-queue_host_test_src_lib", - defaults: ["crossbeam-queue_test_defaults"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "crossbeam-queue_device_test_src_lib", + name: "crossbeam-queue_test_tests_array_queue", defaults: ["crossbeam-queue_test_defaults"], -} - -rust_defaults { - name: "crossbeam-queue_test_defaults_crossbeam_queue", - crate_name: "crossbeam_queue", - cargo_env_compat: true, - cargo_pkg_version: "0.3.2", - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2018", - features: [ - "alloc", - "default", - "std", - ], - rustlibs: [ - "libcfg_if", - "libcrossbeam_queue", - "libcrossbeam_utils", - "librand", - ], -} - -rust_test_host { - name: "crossbeam-queue_host_test_tests_array_queue", - defaults: ["crossbeam-queue_test_defaults_crossbeam_queue"], + host_supported: true, srcs: ["tests/array_queue.rs"], test_options: { unit_test: true, @@ -104,26 +71,15 @@ rust_test_host { } rust_test { - name: "crossbeam-queue_device_test_tests_array_queue", - defaults: ["crossbeam-queue_test_defaults_crossbeam_queue"], - srcs: ["tests/array_queue.rs"], -} - -rust_test_host { - name: "crossbeam-queue_host_test_tests_seg_queue", - defaults: ["crossbeam-queue_test_defaults_crossbeam_queue"], + name: "crossbeam-queue_test_tests_seg_queue", + defaults: ["crossbeam-queue_test_defaults"], + host_supported: true, srcs: ["tests/seg_queue.rs"], test_options: { unit_test: true, }, } -rust_test { - name: "crossbeam-queue_device_test_tests_seg_queue", - defaults: ["crossbeam-queue_test_defaults_crossbeam_queue"], - srcs: ["tests/seg_queue.rs"], -} - rust_library { name: "libcrossbeam_queue", host_supported: true, diff --git a/TEST_MAPPING b/TEST_MAPPING index 53eefac..ffd0851 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,19 +1,24 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/vulkano" + } + ], "presubmit": [ { - "name": "crossbeam-queue_device_test_src_lib" + "name": "crossbeam-queue_test_tests_array_queue" }, { - "name": "crossbeam-queue_device_test_tests_array_queue" + "name": "crossbeam-queue_test_tests_seg_queue" + } + ], + "presubmit-rust": [ + { + "name": "crossbeam-queue_test_tests_array_queue" }, { - "name": "crossbeam-queue_device_test_tests_seg_queue" + "name": "crossbeam-queue_test_tests_seg_queue" } - // Manually disabled as these tests depend on specific graphics libraries - // being available on the machine running the tests. - //{ - // "name": "vulkano_device_test_src_lib" - //} ] } |