aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Lozano <ivanlozano@google.com>2022-07-08 16:25:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-07-08 16:25:52 +0000
commitf085ef723e026ffb25c060bd881c80d29f4788e8 (patch)
tree131ff9aa27cabc7f89bd5125f713a1deaa578eb2
parent5cb11d8a312fa1127f03e5870aaad3e0e9391c0c (diff)
parentac43ee91746c36f7d0a350a05cbefb60ce2dc2ef (diff)
downloadrusqlite-f085ef723e026ffb25c060bd881c80d29f4788e8.tar.gz
Revert "Enable tests" am: 1c39579252 am: ac43ee9174
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/2148933 Change-Id: I376276c8dbdc8b2b73f297689d68a7e901c427c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp73
-rw-r--r--TEST_MAPPING12
-rw-r--r--cargo2android-extra-module.bp72
3 files changed, 0 insertions, 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,
- },
-}