From c510159da587d15d38aca6ba2d7d094b0908d609 Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Mon, 29 Nov 2021 14:05:14 -0800 Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING. Test: None Change-Id: I2d62e86371e0e122314b2646cc05a48fde7a3ec2 --- Android.bp | 56 ++++++++++--------------------------------- TEST_MAPPING | 70 ++++++++++++++++++++++++++++++++++++++++-------------- cargo2android.json | 2 +- 3 files changed, 66 insertions(+), 62 deletions(-) diff --git a/Android.bp b/Android.bp index b895649..91f44da 100644 --- a/Android.bp +++ b/Android.bp @@ -77,9 +77,10 @@ rust_defaults { ], } -rust_test_host { - name: "ryu_host_test_tests_common_test", +rust_test { + name: "ryu_test_tests_common_test", defaults: ["ryu_test_defaults"], + host_supported: true, srcs: ["tests/common_test.rs"], test_options: { unit_test: true, @@ -87,14 +88,9 @@ rust_test_host { } rust_test { - name: "ryu_device_test_tests_common_test", - defaults: ["ryu_test_defaults"], - srcs: ["tests/common_test.rs"], -} - -rust_test_host { - name: "ryu_host_test_tests_d2s_table_test", + name: "ryu_test_tests_d2s_table_test", defaults: ["ryu_test_defaults"], + host_supported: true, srcs: ["tests/d2s_table_test.rs"], test_options: { unit_test: true, @@ -102,14 +98,9 @@ rust_test_host { } rust_test { - name: "ryu_device_test_tests_d2s_table_test", - defaults: ["ryu_test_defaults"], - srcs: ["tests/d2s_table_test.rs"], -} - -rust_test_host { - name: "ryu_host_test_tests_d2s_test", + name: "ryu_test_tests_d2s_test", defaults: ["ryu_test_defaults"], + host_supported: true, srcs: ["tests/d2s_test.rs"], test_options: { unit_test: true, @@ -117,14 +108,9 @@ rust_test_host { } rust_test { - name: "ryu_device_test_tests_d2s_test", - defaults: ["ryu_test_defaults"], - srcs: ["tests/d2s_test.rs"], -} - -rust_test_host { - name: "ryu_host_test_tests_f2s_test", + name: "ryu_test_tests_f2s_test", defaults: ["ryu_test_defaults"], + host_supported: true, srcs: ["tests/f2s_test.rs"], test_options: { unit_test: true, @@ -132,14 +118,9 @@ rust_test_host { } rust_test { - name: "ryu_device_test_tests_f2s_test", - defaults: ["ryu_test_defaults"], - srcs: ["tests/f2s_test.rs"], -} - -rust_test_host { - name: "ryu_host_test_tests_s2d_test", + name: "ryu_test_tests_s2d_test", defaults: ["ryu_test_defaults"], + host_supported: true, srcs: ["tests/s2d_test.rs"], test_options: { unit_test: true, @@ -147,22 +128,11 @@ rust_test_host { } rust_test { - name: "ryu_device_test_tests_s2d_test", - defaults: ["ryu_test_defaults"], - srcs: ["tests/s2d_test.rs"], -} - -rust_test_host { - name: "ryu_host_test_tests_s2f_test", + name: "ryu_test_tests_s2f_test", defaults: ["ryu_test_defaults"], + host_supported: true, srcs: ["tests/s2f_test.rs"], test_options: { unit_test: true, }, } - -rust_test { - name: "ryu_device_test_tests_s2f_test", - defaults: ["ryu_test_defaults"], - srcs: ["tests/s2f_test.rs"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index 7aaab34..701f911 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,59 +1,93 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/base64" + }, + { + "path": "external/rust/crates/bitflags" + }, + { + "path": "external/rust/crates/either" + }, + { + "path": "external/rust/crates/rand_chacha" + }, + { + "path": "external/rust/crates/tinytemplate" + }, + { + "path": "external/rust/crates/tinyvec" + }, + { + "path": "external/rust/crates/unicode-xid" + }, + { + "path": "external/rust/crates/url" + } + ], "presubmit": [ { - "name": "base64_device_test_tests_decode" + "name": "ZipFuseTest" + }, + { + "name": "authfs_device_test_src_lib" }, { - "name": "base64_device_test_tests_encode" + "name": "microdroid_manager_test" }, { - "name": "base64_device_test_tests_helpers" + "name": "ryu_test_tests_common_test" }, { - "name": "bitflags_device_test_src_lib" + "name": "ryu_test_tests_d2s_table_test" }, { - "name": "bitflags_device_test_tests_basic" + "name": "ryu_test_tests_d2s_test" }, { - "name": "either_device_test_src_lib" + "name": "ryu_test_tests_f2s_test" }, { - "name": "rand_chacha_device_test_src_lib" + "name": "ryu_test_tests_s2d_test" }, { - "name": "ryu_device_test_tests_common_test" + "name": "ryu_test_tests_s2f_test" }, { - "name": "ryu_device_test_tests_d2s_table_test" + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "ZipFuseTest" }, { - "name": "ryu_device_test_tests_d2s_test" + "name": "authfs_device_test_src_lib" }, { - "name": "ryu_device_test_tests_f2s_test" + "name": "microdroid_manager_test" }, { - "name": "ryu_device_test_tests_s2d_test" + "name": "ryu_test_tests_common_test" }, { - "name": "ryu_device_test_tests_s2f_test" + "name": "ryu_test_tests_d2s_table_test" }, { - "name": "unicode-xid_device_test_src_lib" + "name": "ryu_test_tests_d2s_test" }, { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "name": "ryu_test_tests_f2s_test" }, { - "name": "url_device_test_src_lib" + "name": "ryu_test_tests_s2d_test" }, { - "name": "url_device_test_tests_data" + "name": "ryu_test_tests_s2f_test" }, { - "name": "url_device_test_tests_unit" + "name": "virtualizationservice_device_test" } ] } diff --git a/cargo2android.json b/cargo2android.json index 72ca2d4..ac56e26 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -7,4 +7,4 @@ "device": true, "run": true, "tests": true -} +} \ No newline at end of file -- cgit v1.2.3