diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:26 +0000 |
commit | 412d3878abe529ba0d8f5d87bf6342a27aeb1968 (patch) | |
tree | 5ed90b3c47bdff962f84b3a8ca4e85644145877c | |
parent | af1833bead263a737cdf46fabca23f4a7c3e625a (diff) | |
parent | da2a7fd962d31e175c9b14414e35fb80d8504fe4 (diff) | |
download | ryu-412d3878abe529ba0d8f5d87bf6342a27aeb1968.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c666b01949 am: aa868c01d7 am: da2a7fd962
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ryu/+/1912440
Change-Id: I8f0ba004c8cf391596544474cfa1d0164a23785c
-rw-r--r-- | Android.bp | 56 | ||||
-rw-r--r-- | TEST_MAPPING | 70 | ||||
-rw-r--r-- | cargo2android.json | 2 |
3 files changed, 66 insertions, 62 deletions
@@ -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 |