diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-06-08 10:40:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-08 10:40:52 +0000 |
commit | d1507c0ceae1da46014b1e9f90f18cc625759a19 (patch) | |
tree | 388f41331f2697b6d72afea4e1a03404b8fd5f71 | |
parent | 1e6f1123a5bc11f790e5c950bdd9f9cffddb720f (diff) | |
parent | c02624d1e57d8b2c58b62c1ff41c4c3bf6d481fe (diff) | |
download | flate2-d1507c0ceae1da46014b1e9f90f18cc625759a19.tar.gz |
Merge "Enable tests" am: e529d6ed4a am: 6e7094ba7c am: c02624d1e5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/flate2/+/2117749
Change-Id: I018125438b1f24a2b4b5813beee786854dcbfcdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 90 | ||||
-rw-r--r-- | TEST_MAPPING | 45 | ||||
-rw-r--r-- | cargo2android.json | 13 | ||||
-rw-r--r-- | patches/Android.bp.patch | 44 |
4 files changed, 190 insertions, 2 deletions
@@ -37,6 +37,96 @@ license { ], } +rust_test { + name: "flate2_test_src_lib", + crate_name: "flate2", + cargo_env_compat: true, + cargo_pkg_version: "1.0.24", + srcs: ["src/lib.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, + test_options: { + unit_test: true, + }, + edition: "2018", + features: [ + "any_zlib", + "libz-sys", + "zlib", + ], + rustlibs: [ + "libcrc32fast", + "liblibz_sys", + "libquickcheck", + "librand", + ], +} + +rust_defaults { + name: "flate2_test_defaults", + crate_name: "flate2", + cargo_env_compat: true, + cargo_pkg_version: "1.0.24", + test_suites: ["general-tests"], + auto_gen_config: true, + edition: "2018", + features: [ + "any_zlib", + "libz-sys", + "zlib", + ], + rustlibs: [ + "libcrc32fast", + "libflate2", + "liblibz_sys", + "libquickcheck", + "librand", + ], +} + +rust_test { + name: "flate2_test_tests_early-flush", + defaults: ["flate2_test_defaults"], + srcs: ["tests/early-flush.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "flate2_test_tests_empty-read", + defaults: ["flate2_test_defaults"], + srcs: ["tests/empty-read.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "flate2_test_tests_gunzip", + defaults: ["flate2_test_defaults"], + srcs: ["tests/gunzip.rs"], + test_options: { + unit_test: true, + }, + data: [ + "tests/corrupt-gz-file.bin", + "tests/good-file.gz", + "tests/good-file.txt", + "tests/multi.gz", + "tests/multi.txt", + ], +} + +rust_test { + name: "flate2_test_tests_zero-write", + defaults: ["flate2_test_defaults"], + srcs: ["tests/zero-write.rs"], + test_options: { + unit_test: true, + }, +} + rust_library { name: "libflate2", host_supported: true, diff --git a/TEST_MAPPING b/TEST_MAPPING index c887c0f..e3a2ccd 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -5,6 +5,21 @@ "name": "ZipFuseTest" }, { + "name": "flate2_test_src_lib" + }, + { + "name": "flate2_test_tests_early-flush" + }, + { + "name": "flate2_test_tests_empty-read" + }, + { + "name": "flate2_test_tests_gunzip" + }, + { + "name": "flate2_test_tests_zero-write" + }, + { "name": "libapexutil_rust.test" }, { @@ -25,6 +40,21 @@ "name": "ZipFuseTest" }, { + "name": "flate2_test_src_lib" + }, + { + "name": "flate2_test_tests_early-flush" + }, + { + "name": "flate2_test_tests_empty-read" + }, + { + "name": "flate2_test_tests_gunzip" + }, + { + "name": "flate2_test_tests_zero-write" + }, + { "name": "libapexutil_rust.test" }, { @@ -45,6 +75,21 @@ "name": "ZipFuseTest" }, { + "name": "flate2_test_src_lib" + }, + { + "name": "flate2_test_tests_early-flush" + }, + { + "name": "flate2_test_tests_empty-read" + }, + { + "name": "flate2_test_tests_gunzip" + }, + { + "name": "flate2_test_tests_zero-write" + }, + { "name": "libapexutil_rust.test" }, { diff --git a/cargo2android.json b/cargo2android.json index 85a6aa6..11879eb 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -5,5 +5,14 @@ ], "device": true, "features": "zlib", - "run": true -}
\ No newline at end of file + "run": true, + "patch": "patches/Android.bp.patch", + "tests": true, + "test-data": [ + "tests/gunzip.rs=tests/corrupt-gz-file.bin", + "tests/gunzip.rs=tests/good-file.gz", + "tests/gunzip.rs=tests/good-file.txt", + "tests/gunzip.rs=tests/multi.gz", + "tests/gunzip.rs=tests/multi.txt" + ] +} diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..903ecfe --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,44 @@ +diff --git a/Android.bp b/Android.bp +index 0d89ca8..d52dddd 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -39,7 +39,6 @@ license { + + rust_test { + name: "flate2_test_src_lib", +- host_supported: true, + crate_name: "flate2", + cargo_env_compat: true, + cargo_pkg_version: "1.0.24", +@@ -88,7 +87,6 @@ rust_defaults { + rust_test { + name: "flate2_test_tests_early-flush", + defaults: ["flate2_test_defaults"], +- host_supported: true, + srcs: ["tests/early-flush.rs"], + test_options: { + unit_test: true, +@@ -98,7 +96,6 @@ rust_test { + rust_test { + name: "flate2_test_tests_empty-read", + defaults: ["flate2_test_defaults"], +- host_supported: true, + srcs: ["tests/empty-read.rs"], + test_options: { + unit_test: true, +@@ -108,7 +105,6 @@ rust_test { + rust_test { + name: "flate2_test_tests_gunzip", + defaults: ["flate2_test_defaults"], +- host_supported: true, + srcs: ["tests/gunzip.rs"], + test_options: { + unit_test: true, +@@ -125,7 +121,6 @@ rust_test { + rust_test { + name: "flate2_test_tests_zero-write", + defaults: ["flate2_test_defaults"], +- host_supported: true, + srcs: ["tests/zero-write.rs"], + test_options: { + unit_test: true, |