diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:06:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:06:49 +0000 |
commit | 1de029ad63b9d3a44c650be4c770bf94638c685f (patch) | |
tree | 2eee2630497356c9f0666e2aedc13bbe9573fbfc | |
parent | af0012bea66a448278d0d092a5a3f6f028bb0a77 (diff) | |
parent | 4bd63c1f77250eaba61cc6e05c68f0d5417c4489 (diff) | |
download | untrusted-1de029ad63b9d3a44c650be4c770bf94638c685f.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 18dbccb8a3 am: e7307945a2 am: ae023b29c3 am: 4bd63c1f77
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/untrusted/+/1912820
Change-Id: Ic6d86af6b85eda01d1dbebe6003d0c4c1d6981e9
-rw-r--r-- | Android.bp | 49 | ||||
-rw-r--r-- | TEST_MAPPING | 76 | ||||
-rw-r--r-- | cargo2android.json | 2 |
3 files changed, 37 insertions, 90 deletions
@@ -23,6 +23,8 @@ rust_library { // has rustc warnings host_supported: true, crate_name: "untrusted", + cargo_env_compat: true, + cargo_pkg_version: "0.7.1", srcs: ["src/untrusted.rs"], edition: "2018", apex_available: [ @@ -34,51 +36,26 @@ rust_library { min_sdk_version: "29", } -rust_defaults { - name: "untrusted_defaults", - crate_name: "untrusted", +rust_test { + name: "untrusted_test_tests_tests", // has rustc warnings - srcs: ["src/untrusted.rs"], + host_supported: true, + crate_name: "tests", + cargo_env_compat: true, + cargo_pkg_version: "0.7.1", + srcs: ["tests/tests.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2018", -} - -rust_test_host { - name: "untrusted_host_test_src_untrusted", - defaults: ["untrusted_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "untrusted_device_test_src_untrusted", - defaults: ["untrusted_defaults"], -} - -rust_defaults { - name: "untrusted_defaults_tests", - crate_name: "tests", - // has rustc warnings - srcs: ["tests/tests.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, edition: "2018", rustlibs: [ "libuntrusted", ], } -rust_test_host { - name: "untrusted_host_test_tests_tests", - defaults: ["untrusted_defaults_tests"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "untrusted_device_test_tests_tests", - defaults: ["untrusted_defaults_tests"], -} +// Errors when listing tests: +// error: lint `non_autolinks` has been renamed to `rustdoc::bare_urls` +// error: aborting due to previous error +// error: test failed, to rerun pass '--doc' diff --git a/TEST_MAPPING b/TEST_MAPPING index dd705a6..c1c46bd 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,5 +1,16 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/quiche" + }, + { + "path": "external/rust/crates/ring" + }, + { + "path": "external/rust/crates/webpki" + } + ], "presubmit": [ { "name": "apkdmverity.test" @@ -20,77 +31,36 @@ "name": "microdroid_manager_test" }, { - "name": "quiche_device_test_src_lib" - }, - { - "name": "ring_device_test_src_lib", - "options": [ - { - "test-timeout": "100000" - } - ] - }, - { - "name": "ring_device_test_tests_aead_tests" + "name": "untrusted_test_tests_tests" }, { - "name": "ring_device_test_tests_agreement_tests" - }, - { - "name": "ring_device_test_tests_constant_time_tests" - }, - { - "name": "ring_device_test_tests_digest_tests", - "options": [ - { - "test-timeout": "600000" - } - ] - }, - { - "name": "ring_device_test_tests_ecdsa_tests" - }, - { - "name": "ring_device_test_tests_ed25519_tests" - }, - { - "name": "ring_device_test_tests_hkdf_tests" - }, - { - "name": "ring_device_test_tests_hmac_tests" - }, + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ { - "name": "ring_device_test_tests_pbkdf2_tests" + "name": "apkdmverity.test" }, { - "name": "ring_device_test_tests_quic_tests" + "name": "doh_unit_test" }, { - "name": "ring_device_test_tests_rand_tests" + "name": "libapkverify.integration_test" }, { - "name": "ring_device_test_tests_rsa_tests" + "name": "libapkverify.test" }, { - "name": "ring_device_test_tests_signature_tests" + "name": "libidsig.test" }, { - "name": "untrusted_device_test_src_untrusted" + "name": "microdroid_manager_test" }, { - "name": "untrusted_device_test_tests_tests" + "name": "untrusted_test_tests_tests" }, { "name": "virtualizationservice_device_test" - }, - { - "name": "webpki_device_test_src_lib" - }, - { - "name": "webpki_device_test_tests_dns_name_tests" - }, - { - "name": "webpki_device_test_tests_integration" } ] } diff --git a/cargo2android.json b/cargo2android.json index 646ac59..506d866 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -10,4 +10,4 @@ "min-sdk-version": "29", "run": true, "tests": true -} +}
\ No newline at end of file |