diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:01 +0000 |
commit | 4c5d078b8780b01b32be11a8e9a7870d168caf7f (patch) | |
tree | b4785764c7be621ef87dbf9ed3dac4dd07356072 | |
parent | 2380ccb673a79ebb5795d4590020f1f8ba3e15bd (diff) | |
parent | c331235859bc8e34f4b52fa356f1150751567a5e (diff) | |
download | regex-4c5d078b8780b01b32be11a8e9a7870d168caf7f.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c5221907e5 am: c331235859
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/regex/+/1912795
Change-Id: Id4f2371e96f4d98aa4b999158d7d7ab8c3674e0c
-rw-r--r-- | Android.bp | 212 | ||||
-rw-r--r-- | TEST_MAPPING | 68 | ||||
-rw-r--r-- | cargo2android.json | 2 |
3 files changed, 107 insertions, 175 deletions
@@ -76,14 +76,18 @@ rust_library { ], } -rust_defaults { - name: "regex_test_defaults", +rust_test { + name: "regex_test_src_lib", + host_supported: true, crate_name: "regex", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "1.5.4", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "aho-corasick", @@ -114,27 +118,18 @@ rust_defaults { ], } -rust_test_host { - name: "regex_host_test_src_lib", - defaults: ["regex_test_defaults"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "regex_device_test_src_lib", - defaults: ["regex_test_defaults"], -} - -rust_defaults { - name: "regex_test_defaults_backtrack", + name: "regex_test_tests_test_backtrack", + host_supported: true, crate_name: "backtrack", - srcs: ["tests/test_backtrack.rs"], cargo_env_compat: true, cargo_pkg_version: "1.5.4", + srcs: ["tests/test_backtrack.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "aho-corasick", @@ -166,27 +161,18 @@ rust_defaults { ], } -rust_test_host { - name: "regex_host_test_tests_test_backtrack", - defaults: ["regex_test_defaults_backtrack"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "regex_device_test_tests_test_backtrack", - defaults: ["regex_test_defaults_backtrack"], -} - -rust_defaults { - name: "regex_test_defaults_backtrack_bytes", + name: "regex_test_tests_test_backtrack_bytes", + host_supported: true, crate_name: "backtrack_bytes", - srcs: ["tests/test_backtrack_bytes.rs"], cargo_env_compat: true, cargo_pkg_version: "1.5.4", + srcs: ["tests/test_backtrack_bytes.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "aho-corasick", @@ -218,27 +204,18 @@ rust_defaults { ], } -rust_test_host { - name: "regex_host_test_tests_test_backtrack_bytes", - defaults: ["regex_test_defaults_backtrack_bytes"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "regex_device_test_tests_test_backtrack_bytes", - defaults: ["regex_test_defaults_backtrack_bytes"], -} - -rust_defaults { - name: "regex_test_defaults_backtrack_utf8bytes", + name: "regex_test_tests_test_backtrack_utf8bytes", + host_supported: true, crate_name: "backtrack_utf8bytes", - srcs: ["tests/test_backtrack_utf8bytes.rs"], cargo_env_compat: true, cargo_pkg_version: "1.5.4", + srcs: ["tests/test_backtrack_utf8bytes.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "aho-corasick", @@ -270,27 +247,18 @@ rust_defaults { ], } -rust_test_host { - name: "regex_host_test_tests_test_backtrack_utf8bytes", - defaults: ["regex_test_defaults_backtrack_utf8bytes"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "regex_device_test_tests_test_backtrack_utf8bytes", - defaults: ["regex_test_defaults_backtrack_utf8bytes"], -} - -rust_defaults { - name: "regex_test_defaults_crates_regex", + name: "regex_test_tests_test_crates_regex", + host_supported: true, crate_name: "crates_regex", - srcs: ["tests/test_crates_regex.rs"], cargo_env_compat: true, cargo_pkg_version: "1.5.4", + srcs: ["tests/test_crates_regex.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "aho-corasick", @@ -322,27 +290,18 @@ rust_defaults { ], } -rust_test_host { - name: "regex_host_test_tests_test_crates_regex", - defaults: ["regex_test_defaults_crates_regex"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "regex_device_test_tests_test_crates_regex", - defaults: ["regex_test_defaults_crates_regex"], -} - -rust_defaults { - name: "regex_test_defaults_default", + name: "regex_test_tests_test_default", + host_supported: true, crate_name: "default", - srcs: ["tests/test_default.rs"], cargo_env_compat: true, cargo_pkg_version: "1.5.4", + srcs: ["tests/test_default.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "aho-corasick", @@ -374,27 +333,18 @@ rust_defaults { ], } -rust_test_host { - name: "regex_host_test_tests_test_default", - defaults: ["regex_test_defaults_default"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "regex_device_test_tests_test_default", - defaults: ["regex_test_defaults_default"], -} - -rust_defaults { - name: "regex_test_defaults_default_bytes", + name: "regex_test_tests_test_default_bytes", + host_supported: true, crate_name: "default_bytes", - srcs: ["tests/test_default_bytes.rs"], cargo_env_compat: true, cargo_pkg_version: "1.5.4", + srcs: ["tests/test_default_bytes.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "aho-corasick", @@ -426,27 +376,18 @@ rust_defaults { ], } -rust_test_host { - name: "regex_host_test_tests_test_default_bytes", - defaults: ["regex_test_defaults_default_bytes"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "regex_device_test_tests_test_default_bytes", - defaults: ["regex_test_defaults_default_bytes"], -} - -rust_defaults { - name: "regex_test_defaults_nfa", + name: "regex_test_tests_test_nfa", + host_supported: true, crate_name: "nfa", - srcs: ["tests/test_nfa.rs"], cargo_env_compat: true, cargo_pkg_version: "1.5.4", + srcs: ["tests/test_nfa.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "aho-corasick", @@ -478,27 +419,18 @@ rust_defaults { ], } -rust_test_host { - name: "regex_host_test_tests_test_nfa", - defaults: ["regex_test_defaults_nfa"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "regex_device_test_tests_test_nfa", - defaults: ["regex_test_defaults_nfa"], -} - -rust_defaults { - name: "regex_test_defaults_nfa_bytes", + name: "regex_test_tests_test_nfa_bytes", + host_supported: true, crate_name: "nfa_bytes", - srcs: ["tests/test_nfa_bytes.rs"], cargo_env_compat: true, cargo_pkg_version: "1.5.4", + srcs: ["tests/test_nfa_bytes.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "aho-corasick", @@ -530,27 +462,18 @@ rust_defaults { ], } -rust_test_host { - name: "regex_host_test_tests_test_nfa_bytes", - defaults: ["regex_test_defaults_nfa_bytes"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "regex_device_test_tests_test_nfa_bytes", - defaults: ["regex_test_defaults_nfa_bytes"], -} - -rust_defaults { - name: "regex_test_defaults_nfa_utf8bytes", + name: "regex_test_tests_test_nfa_utf8bytes", + host_supported: true, crate_name: "nfa_utf8bytes", - srcs: ["tests/test_nfa_utf8bytes.rs"], cargo_env_compat: true, cargo_pkg_version: "1.5.4", + srcs: ["tests/test_nfa_utf8bytes.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "aho-corasick", @@ -581,16 +504,3 @@ rust_defaults { "libregex_syntax", ], } - -rust_test_host { - name: "regex_host_test_tests_test_nfa_utf8bytes", - defaults: ["regex_test_defaults_nfa_utf8bytes"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "regex_device_test_tests_test_nfa_utf8bytes", - defaults: ["regex_test_defaults_nfa_utf8bytes"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index d3da861..ee82488 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,77 +1,99 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ + { + "path": "external/rust/crates/base64" + }, + { + "path": "external/rust/crates/libsqlite3-sys" + }, { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/once_cell" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/tinytemplate" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/tinyvec" }, { + "path": "external/rust/crates/unicode-xid" + } + ], + "presubmit": [ + { "name": "keystore2_test" }, { "name": "legacykeystore_test" }, { - "name": "libsqlite3-sys_device_test_src_lib" + "name": "regex_test_src_lib" }, { - "name": "libsqlite3_bindgen_test" + "name": "regex_test_tests_test_backtrack" }, { - "name": "once_cell_device_test_src_lib" + "name": "regex_test_tests_test_backtrack_bytes" }, { - "name": "once_cell_device_test_tests_it" + "name": "regex_test_tests_test_backtrack_utf8bytes" }, { - "name": "regex_device_test_src_lib" + "name": "regex_test_tests_test_crates_regex" }, { - "name": "regex_device_test_tests_test_backtrack" + "name": "regex_test_tests_test_default" }, { - "name": "regex_device_test_tests_test_backtrack_bytes" + "name": "regex_test_tests_test_default_bytes" }, { - "name": "regex_device_test_tests_test_backtrack_utf8bytes" + "name": "regex_test_tests_test_nfa" }, { - "name": "regex_device_test_tests_test_crates_regex" + "name": "regex_test_tests_test_nfa_bytes" + }, + { + "name": "regex_test_tests_test_nfa_utf8bytes" + } + ], + "presubmit-rust": [ + { + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" }, { - "name": "regex_device_test_tests_test_default" + "name": "regex_test_src_lib" }, { - "name": "regex_device_test_tests_test_default_bytes" + "name": "regex_test_tests_test_backtrack" }, { - "name": "regex_device_test_tests_test_nfa" + "name": "regex_test_tests_test_backtrack_bytes" }, { - "name": "regex_device_test_tests_test_nfa_bytes" + "name": "regex_test_tests_test_backtrack_utf8bytes" }, { - "name": "regex_device_test_tests_test_nfa_utf8bytes" + "name": "regex_test_tests_test_crates_regex" }, { - "name": "tinytemplate_device_test_src_lib" + "name": "regex_test_tests_test_default" }, { - "name": "tinyvec_device_test_tests_arrayvec" + "name": "regex_test_tests_test_default_bytes" }, { - "name": "tinyvec_device_test_tests_tinyvec" + "name": "regex_test_tests_test_nfa" }, { - "name": "unicode-xid_device_test_src_lib" + "name": "regex_test_tests_test_nfa_bytes" }, { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "name": "regex_test_tests_test_nfa_utf8bytes" } ] } diff --git a/cargo2android.json b/cargo2android.json index 72ca2d4..ac56e26 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -7,4 +7,4 @@ "device": true, "run": true, "tests": true -} +}
\ No newline at end of file |