diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:07:14 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:07:14 +0000 |
commit | 980d080eedd65d0ca2dbef0811e1083030d3dd2e (patch) | |
tree | d361da931e8c52ac15db3459546733dea4d562b9 | |
parent | 155b1bd5323db87f0be6d1b35028083999ae8350 (diff) | |
parent | 685133a9cf208b8c92f7d024096afef20ec816c9 (diff) | |
download | matches-android13-release.tar.gz |
Snap for 8006021 from 685133a9cf208b8c92f7d024096afef20ec816c9 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-14.0.0_r3android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi
Change-Id: Ic5a2a3c4fb44d38fe2007c0bda462d48cb5f1e2b
-rw-r--r-- | Android.bp | 49 | ||||
-rw-r--r-- | TEST_MAPPING | 26 |
2 files changed, 32 insertions, 43 deletions
@@ -34,33 +34,24 @@ rust_library { min_sdk_version: "29", } -rust_defaults { - name: "matches_test_defaults", - crate_name: "matches", +rust_test { + name: "matches_test_lib", // has rustc warnings - srcs: ["lib.rs"], + host_supported: true, + crate_name: "matches", cargo_env_compat: true, cargo_pkg_version: "0.1.9", + srcs: ["lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2015", -} - -rust_test_host { - name: "matches_host_test_lib", - defaults: ["matches_test_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "matches_device_test_lib", - defaults: ["matches_test_defaults"], + edition: "2015", } rust_defaults { - name: "matches_test_defaults_matches", + name: "matches_test_defaults", crate_name: "matches", cargo_env_compat: true, cargo_pkg_version: "0.1.9", @@ -72,10 +63,11 @@ rust_defaults { ], } -rust_test_host { - name: "matches_host_test_tests_macro_use_one", - defaults: ["matches_test_defaults_matches"], +rust_test { + name: "matches_test_tests_macro_use_one", + defaults: ["matches_test_defaults"], // has rustc warnings + host_supported: true, srcs: ["tests/macro_use_one.rs"], test_options: { unit_test: true, @@ -83,25 +75,12 @@ rust_test_host { } rust_test { - name: "matches_device_test_tests_macro_use_one", - defaults: ["matches_test_defaults_matches"], - // has rustc warnings - srcs: ["tests/macro_use_one.rs"], -} - -rust_test_host { - name: "matches_host_test_tests_use_star", - defaults: ["matches_test_defaults_matches"], + name: "matches_test_tests_use_star", + defaults: ["matches_test_defaults"], // has rustc warnings + host_supported: true, srcs: ["tests/use_star.rs"], test_options: { unit_test: true, }, } - -rust_test { - name: "matches_device_test_tests_use_star", - defaults: ["matches_test_defaults_matches"], - // has rustc warnings - srcs: ["tests/use_star.rs"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index 798b57b..577d626 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,29 +1,39 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/quiche" + }, + { + "path": "external/rust/crates/url" + } + ], "presubmit": [ { "name": "doh_unit_test" }, { - "name": "matches_device_test_lib" + "name": "matches_test_lib" }, { - "name": "matches_device_test_tests_macro_use_one" + "name": "matches_test_tests_macro_use_one" }, { - "name": "quiche_device_test_src_lib" - }, + "name": "matches_test_tests_use_star" + } + ], + "presubmit-rust": [ { - "name": "unicode-bidi_device_test_src_lib" + "name": "doh_unit_test" }, { - "name": "url_device_test_src_lib" + "name": "matches_test_lib" }, { - "name": "url_device_test_tests_data" + "name": "matches_test_tests_macro_use_one" }, { - "name": "url_device_test_tests_unit" + "name": "matches_test_tests_use_star" } ] } |