diff options
author | Ivan Lozano <ivanlozano@google.com> | 2022-07-08 16:05:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-07-08 16:05:31 +0000 |
commit | ac43ee91746c36f7d0a350a05cbefb60ce2dc2ef (patch) | |
tree | 131ff9aa27cabc7f89bd5125f713a1deaa578eb2 | |
parent | 8b65fc4b46dd23cc327f45faaefd47975b9d0701 (diff) | |
parent | 1c39579252014acc313ea99526926af7c84fda7b (diff) | |
download | rusqlite-ac43ee91746c36f7d0a350a05cbefb60ce2dc2ef.tar.gz |
Revert "Enable tests" am: 1c39579252main-16k
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/2148933
Change-Id: I38b04f62cf004ee3267560baedce176e1a52f622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 73 | ||||
-rw-r--r-- | TEST_MAPPING | 12 | ||||
-rw-r--r-- | cargo2android-extra-module.bp | 72 |
3 files changed, 0 insertions, 157 deletions
@@ -63,76 +63,3 @@ rust_library { ], } -rust_test { - name: "rusqlite_test_src_lib", - host_supported: true, - crate_name: "rusqlite", - cargo_env_compat: true, - cargo_pkg_version: "0.27.0", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - test_options: { - unit_test: true, - }, - edition: "2018", - features: [ - "modern_sqlite", - "trace", - ], - rustlibs: [ - "libbencher", - "libbitflags", - "libfallible_iterator", - "libfallible_streaming_iterator", - "libhashlink", - "liblazy_static", - "liblibsqlite3_sys", - "libmemchr", - "libregex", - "libsmallvec", - "libtempfile", - "libuuid", - ], -} - -rust_defaults { - name: "rusqlite_test_defaults", - crate_name: "rusqlite", - cargo_env_compat: true, - cargo_pkg_version: "0.27.0", - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2018", - features: [ - "modern_sqlite", - "trace", - ], - rustlibs: [ - "libbencher", - "libbitflags", - "libfallible_iterator", - "libfallible_streaming_iterator", - "libhashlink", - "liblazy_static", - "liblibsqlite3_sys", - "libmemchr", - "libregex", - "librusqlite", - "libsmallvec", - "libtempfile", - "libuuid", - ], -} - -rust_test { - name: "rusqlite_test_tests_deny_single_threaded_sqlite_config", - defaults: ["rusqlite_test_defaults"], - host_supported: true, - srcs: ["tests/deny_single_threaded_sqlite_config.rs"], - test_options: { - unit_test: true, - }, -} - - diff --git a/TEST_MAPPING b/TEST_MAPPING index 429f33b..aa301aa 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -9,12 +9,6 @@ }, { "name": "legacykeystore_test" - }, - { - "name": "rusqlite_test_src_lib" - }, - { - "name": "rusqlite_test_tests_deny_single_threaded_sqlite_config" } ], "presubmit-rust": [ @@ -26,12 +20,6 @@ }, { "name": "legacykeystore_test" - }, - { - "name": "rusqlite_test_src_lib" - }, - { - "name": "rusqlite_test_tests_deny_single_threaded_sqlite_config" } ] } diff --git a/cargo2android-extra-module.bp b/cargo2android-extra-module.bp index e8f1ccc..33222cb 100644 --- a/cargo2android-extra-module.bp +++ b/cargo2android-extra-module.bp @@ -19,75 +19,3 @@ rust_library { "libsmallvec", ], } - -rust_test { - name: "rusqlite_test_src_lib", - host_supported: true, - crate_name: "rusqlite", - cargo_env_compat: true, - cargo_pkg_version: "0.27.0", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - test_options: { - unit_test: true, - }, - edition: "2018", - features: [ - "modern_sqlite", - "trace", - ], - rustlibs: [ - "libbencher", - "libbitflags", - "libfallible_iterator", - "libfallible_streaming_iterator", - "libhashlink", - "liblazy_static", - "liblibsqlite3_sys", - "libmemchr", - "libregex", - "libsmallvec", - "libtempfile", - "libuuid", - ], -} - -rust_defaults { - name: "rusqlite_test_defaults", - crate_name: "rusqlite", - cargo_env_compat: true, - cargo_pkg_version: "0.27.0", - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2018", - features: [ - "modern_sqlite", - "trace", - ], - rustlibs: [ - "libbencher", - "libbitflags", - "libfallible_iterator", - "libfallible_streaming_iterator", - "libhashlink", - "liblazy_static", - "liblibsqlite3_sys", - "libmemchr", - "libregex", - "librusqlite", - "libsmallvec", - "libtempfile", - "libuuid", - ], -} - -rust_test { - name: "rusqlite_test_tests_deny_single_threaded_sqlite_config", - defaults: ["rusqlite_test_defaults"], - host_supported: true, - srcs: ["tests/deny_single_threaded_sqlite_config.rs"], - test_options: { - unit_test: true, - }, -} |