Merge "Use renamed Rust test names."

1 files changed, 101 insertions, 104 deletions

diff --git a/build/tasks/tests/native_test_list.mk b/build/tasks/tests/native_test_list.mk
index 731d92041..a717c3418 100644
--- a/build/tasks/tests/native_test_list.mk
+++ b/build/tasks/tests/native_test_list.mk
@@ -14,22 +14,21 @@
 
 native_tests := \
     adbd_test \
-    android_logger_device_test_src_lib \
-    android_logger_device_test_tests_config_log_level \
-    android_logger_device_test_tests_default_init \
-    android_logger_device_test_tests_multiple_init \
-    anyhow_device_test_src_lib \
-    anyhow_device_test_tests_test_autotrait \
-    anyhow_device_test_tests_test_boxed \
-    anyhow_device_test_tests_test_chain \
-    anyhow_device_test_tests_test_context \
-    anyhow_device_test_tests_test_convert \
-    anyhow_device_test_tests_test_downcast \
-    anyhow_device_test_tests_test_ffi \
-    anyhow_device_test_tests_test_fmt \
-    anyhow_device_test_tests_test_macros \
-    anyhow_device_test_tests_test_repr \
-    anyhow_device_test_tests_test_source \
+    android_logger_test_src_lib \
+    android_logger_test_tests_config_log_level \
+    android_logger_test_tests_default_init \
+    android_logger_test_tests_multiple_init \
+    anyhow_test_src_lib \
+    anyhow_test_tests_test_autotrait \
+    anyhow_test_tests_test_boxed \
+    anyhow_test_tests_test_chain \
+    anyhow_test_tests_test_context \
+    anyhow_test_tests_test_convert \
+    anyhow_test_tests_test_downcast \
+    anyhow_test_tests_test_fmt \
+    anyhow_test_tests_test_macros \
+    anyhow_test_tests_test_repr \
+    anyhow_test_tests_test_source \
     audio_health_tests \
     backtrace_test \
     bionic-unit-tests \
@@ -72,7 +71,7 @@ native_tests := \
     keystore2_crypto_test_rust \
     keystore2_selinux_test \
     keystore2_test \
-    lazy_static_device_test_tests_test \
+    lazy_static_test_tests_test \
     libandroidfw_tests \
     libappfuse_test \
     libbase_test \
@@ -135,100 +134,98 @@ native_tests := \
     resolv_gold_test \
     resolv_integration_test \
     resolv_unit_test \
-    ring_device_test_src_lib \
-    ring_device_test_tests_aead_tests \
-    ring_device_test_tests_agreement_tests \
-    ring_device_test_tests_constant_time_tests \
-    ring_device_test_tests_digest_tests \
-    ring_device_test_tests_ecdsa_tests \
-    ring_device_test_tests_ed25519_tests \
-    ring_device_test_tests_hkdf_tests \
-    ring_device_test_tests_hmac_tests \
-    ring_device_test_tests_pbkdf2_tests \
-    ring_device_test_tests_quic_tests \
-    ring_device_test_tests_rand_tests \
-    ring_device_test_tests_rsa_tests \
-    ring_device_test_tests_signature_tests \
+    ring_test_src_lib \
+    ring_test_tests_aead_tests \
+    ring_test_tests_agreement_tests \
+    ring_test_tests_constant_time_tests \
+    ring_test_tests_digest_tests \
+    ring_test_tests_ecdsa_tests \
+    ring_test_tests_ed25519_tests \
+    ring_test_tests_hkdf_tests \
+    ring_test_tests_hmac_tests \
+    ring_test_tests_pbkdf2_tests \
+    ring_test_tests_quic_tests \
+    ring_test_tests_rand_tests \
+    ring_test_tests_rsa_tests \
+    ring_test_tests_signature_tests \
     scrape_mmap_addr \
     simpleperf_cpu_hotplug_test \
     simpleperf_unit_test \
     statsd_test \
     syscall_filter_unittest_gtest \
     time-unit-tests \
-    tokio_device_test_tests__require_full \
-    tokio_device_test_tests_buffered \
-    tokio_device_test_tests_io_async_fd \
-    tokio_device_test_tests_io_async_read \
-    tokio_device_test_tests_io_chain \
-    tokio_device_test_tests_io_copy \
-    tokio_device_test_tests_io_copy_bidirectional \
-    tokio_device_test_tests_io_driver \
-    tokio_device_test_tests_io_driver_drop \
-    tokio_device_test_tests_io_lines \
-    tokio_device_test_tests_io_mem_stream \
-    tokio_device_test_tests_io_read \
-    tokio_device_test_tests_io_read_buf \
-    tokio_device_test_tests_io_read_exact \
-    tokio_device_test_tests_io_read_line \
-    tokio_device_test_tests_io_read_to_end \
-    tokio_device_test_tests_io_read_to_string \
-    tokio_device_test_tests_io_read_until \
-    tokio_device_test_tests_io_split \
-    tokio_device_test_tests_io_take \
-    tokio_device_test_tests_io_write \
-    tokio_device_test_tests_io_write_all \
-    tokio_device_test_tests_io_write_buf \
-    tokio_device_test_tests_io_write_int \
-    tokio_device_test_tests_macros_join \
-    tokio_device_test_tests_macros_pin \
-    tokio_device_test_tests_macros_select \
-    tokio_device_test_tests_macros_test \
-    tokio_device_test_tests_macros_try_join \
-    tokio_device_test_tests_net_bind_resource \
-    tokio_device_test_tests_net_lookup_host \
-    tokio_device_test_tests_no_rt \
-    tokio_device_test_tests_process_kill_on_drop \
-    tokio_device_test_tests_rt_basic \
-    tokio_device_test_tests_rt_common \
-    tokio_device_test_tests_rt_threaded \
-    tokio_device_test_tests_sync_barrier \
-    tokio_device_test_tests_sync_broadcast \
-    tokio_device_test_tests_sync_errors \
-    tokio_device_test_tests_sync_mpsc \
-    tokio_device_test_tests_sync_mutex \
-    tokio_device_test_tests_sync_mutex_owned \
-    tokio_device_test_tests_sync_notify \
-    tokio_device_test_tests_sync_oneshot \
-    tokio_device_test_tests_sync_rwlock \
-    tokio_device_test_tests_sync_semaphore \
-    tokio_device_test_tests_sync_semaphore_owned \
-    tokio_device_test_tests_sync_watch \
-    tokio_device_test_tests_task_abort \
-    tokio_device_test_tests_task_blocking \
-    tokio_device_test_tests_task_local \
-    tokio_device_test_tests_task_local_set \
-    tokio_device_test_tests_tcp_accept \
-    tokio_device_test_tests_tcp_connect \
-    tokio_device_test_tests_tcp_echo \
-    tokio_device_test_tests_tcp_into_split \
-    tokio_device_test_tests_tcp_into_std \
-    tokio_device_test_tests_tcp_peek \
-    tokio_device_test_tests_tcp_shutdown \
-    tokio_device_test_tests_tcp_socket \
-    tokio_device_test_tests_tcp_split \
-    tokio_device_test_tests_time_rt \
-    tokio_device_test_tests_udp \
-    tokio_device_test_tests_uds_cred \
-    tokio_device_test_tests_uds_split \
-    tokio-test_device_test_src_lib \
-    tokio-test_device_test_tests_block_on \
-    tokio-test_device_test_tests_io \
-    tokio-test_device_test_tests_macros \
-    unicode-xid_device_test_src_lib \
+    tokio_test_tests__require_full \
+    tokio_test_tests_buffered \
+    tokio_test_tests_io_async_fd \
+    tokio_test_tests_io_async_read \
+    tokio_test_tests_io_chain \
+    tokio_test_tests_io_copy \
+    tokio_test_tests_io_copy_bidirectional \
+    tokio_test_tests_io_driver \
+    tokio_test_tests_io_driver_drop \
+    tokio_test_tests_io_lines \
+    tokio_test_tests_io_mem_stream \
+    tokio_test_tests_io_read \
+    tokio_test_tests_io_read_buf \
+    tokio_test_tests_io_read_exact \
+    tokio_test_tests_io_read_line \
+    tokio_test_tests_io_read_to_end \
+    tokio_test_tests_io_read_to_string \
+    tokio_test_tests_io_read_until \
+    tokio_test_tests_io_split \
+    tokio_test_tests_io_take \
+    tokio_test_tests_io_write \
+    tokio_test_tests_io_write_all \
+    tokio_test_tests_io_write_buf \
+    tokio_test_tests_io_write_int \
+    tokio_test_tests_macros_join \
+    tokio_test_tests_macros_pin \
+    tokio_test_tests_macros_select \
+    tokio_test_tests_macros_test \
+    tokio_test_tests_macros_try_join \
+    tokio_test_tests_net_bind_resource \
+    tokio_test_tests_net_lookup_host \
+    tokio_test_tests_no_rt \
+    tokio_test_tests_process_kill_on_drop \
+    tokio_test_tests_rt_basic \
+    tokio_test_tests_rt_common \
+    tokio_test_tests_rt_threaded \
+    tokio_test_tests_sync_barrier \
+    tokio_test_tests_sync_broadcast \
+    tokio_test_tests_sync_errors \
+    tokio_test_tests_sync_mpsc \
+    tokio_test_tests_sync_mutex \
+    tokio_test_tests_sync_mutex_owned \
+    tokio_test_tests_sync_notify \
+    tokio_test_tests_sync_oneshot \
+    tokio_test_tests_sync_rwlock \
+    tokio_test_tests_sync_semaphore \
+    tokio_test_tests_sync_semaphore_owned \
+    tokio_test_tests_sync_watch \
+    tokio_test_tests_task_abort \
+    tokio_test_tests_task_blocking \
+    tokio_test_tests_task_local \
+    tokio_test_tests_task_local_set \
+    tokio_test_tests_tcp_accept \
+    tokio_test_tests_tcp_connect \
+    tokio_test_tests_tcp_echo \
+    tokio_test_tests_tcp_into_split \
+    tokio_test_tests_tcp_into_std \
+    tokio_test_tests_tcp_peek \
+    tokio_test_tests_tcp_shutdown \
+    tokio_test_tests_tcp_socket \
+    tokio_test_tests_tcp_split \
+    tokio_test_tests_time_rt \
+    tokio_test_tests_udp \
+    tokio_test_tests_uds_cred \
+    tokio_test_tests_uds_split \
+    tokio-test_test_tests_block_on \
+    tokio-test_test_tests_io \
+    tokio-test_test_tests_macros \
+    unicode-xid_test_src_lib \
     update_engine_unittests \
-    url_device_test_src_lib \
-    url_device_test_tests_data \
-    url_device_test_tests_unit \
+    url_test_tests_data \
+    url_test_tests_unit \
     vintf_object_test \
     wificond_unit_test \
     ziparchive-tests \