From 1c39579252014acc313ea99526926af7c84fda7b Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Fri, 8 Jul 2022 13:43:42 +0000 Subject: Revert "Enable tests" This reverts commit 3843fccb4777429f416af20382ca171c7fd87265. Reason for revert: b/238415907 Change-Id: I320bf2f47dd109149861636700abe3ad04e502bf --- Android.bp | 73 ------------------------------------------- TEST_MAPPING | 12 ------- cargo2android-extra-module.bp | 72 ------------------------------------------ 3 files changed, 157 deletions(-) diff --git a/Android.bp b/Android.bp index 9b8e68b..d5c31aa 100644 --- a/Android.bp +++ b/Android.bp @@ -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, - }, -} -- cgit v1.2.3