aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2022-07-08 11:44:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-07-08 11:44:53 +0000
commitf179c0882f0261490dc3cd0a515b4c60560943f7 (patch)
treea0a518585866548d24bb81e859fffb798c37f0f6
parent537a58f7dd6a3a8ac6ecb12ba3ae05c8c1a1f298 (diff)
parent23a648b4a1f7b13bf6b40644317b65984e072bce (diff)
downloadrusqlite-f179c0882f0261490dc3cd0a515b4c60560943f7.tar.gz
Enable tests am: 3843fccb47 am: 8b65fc4b46 am: 5cb11d8a31 am: 23a648b4a1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rusqlite/+/2147781 Change-Id: I10c8ea2e9e87e502d21808bc79b1babc484f5068 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, 157 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index d5c31aa..9b8e68b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -63,3 +63,76 @@ 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 aa301aa..429f33b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -9,6 +9,12 @@
},
{
"name": "legacykeystore_test"
+ },
+ {
+ "name": "rusqlite_test_src_lib"
+ },
+ {
+ "name": "rusqlite_test_tests_deny_single_threaded_sqlite_config"
}
],
"presubmit-rust": [
@@ -20,6 +26,12 @@
},
{
"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 33222cb..e8f1ccc 100644
--- a/cargo2android-extra-module.bp
+++ b/cargo2android-extra-module.bp
@@ -19,3 +19,75 @@ 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,
+ },
+}