Stop generating separate rust_test_host.
With b/196306316 hopefully fixed, we should be able to use a single rust_test entry for both device and host tests. This modifies cargo2android.py so it generates these shared tests. Test: Run on crates with simple tests, those with defaults, host-only, and device-only tests. Change-Id: Icfe8d1fb26a61bc9ed65b8a7b116a4ebcd782ce4
This commit is contained in:
@@ -40,19 +40,19 @@ from pathlib import Path
|
||||
# Some tests requires specific options. Consider fixing the upstream crate
|
||||
# before updating this dictionary.
|
||||
TEST_OPTIONS = {
|
||||
"ring_device_test_tests_digest_tests": [{"test-timeout": "600000"}],
|
||||
"ring_device_test_src_lib": [{"test-timeout": "100000"}],
|
||||
"ring_test_tests_digest_tests": [{"test-timeout": "600000"}],
|
||||
"ring_test_src_lib": [{"test-timeout": "100000"}],
|
||||
}
|
||||
|
||||
# Excluded tests. These tests will be ignored by this script.
|
||||
TEST_EXCLUDE = [
|
||||
"aidl_test_rust_client",
|
||||
"aidl_test_rust_service",
|
||||
"ash_device_test_src_lib",
|
||||
"ash_device_test_tests_constant_size_arrays",
|
||||
"ash_device_test_tests_display",
|
||||
"shared_library_device_test_src_lib",
|
||||
"vulkano_device_test_src_lib"
|
||||
"ash_test_src_lib",
|
||||
"ash_test_tests_constant_size_arrays",
|
||||
"ash_test_tests_display",
|
||||
"shared_library_test_src_lib",
|
||||
"vulkano_test_src_lib"
|
||||
]
|
||||
|
||||
# Excluded modules.
|
||||
|
||||
Reference in New Issue
Block a user