Add feature "full" to enable more tokio tests am: 4724ea38d1 am: defc69f674

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1689569

Change-Id: I22e21a46ff6238bf32c4d1a69860a1d5125de76d

3 files changed, 300 insertions, 289 deletions

diff --git a/Android.bp b/Android.bp
index b654899..5a006b4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --device --run --features io-util,macros,rt-multi-thread,sync,net,fs,time --tests.
+// This file is generated by cargo2android.py --device --run --features io-util,macros,rt-multi-thread,sync,net,fs,time --tests --patch=patches/Android.bp.patch.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -61,6 +61,7 @@ rust_defaults {
     features: [
         "bytes",
         "fs",
+        "full",
         "io-util",
         "libc",
         "macros",
@@ -109,36 +110,6 @@ rust_test {
 }
 
 rust_test_host {
-    name: "tokio_host_test_tests_fs_file",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/fs_file.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_fs_file",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/fs_file.rs"],
-}
-
-rust_test_host {
-    name: "tokio_host_test_tests_fs_link",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/fs_link.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_fs_link",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/fs_link.rs"],
-}
-
-rust_test_host {
     name: "tokio_host_test_tests_io_async_read",
     defaults: ["tokio_defaults"],
     srcs: ["tests/io_async_read.rs"],
@@ -349,51 +320,6 @@ rust_test {
 }
 
 rust_test_host {
-    name: "tokio_host_test_tests_process_issue_2174",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/process_issue_2174.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_process_issue_2174",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/process_issue_2174.rs"],
-}
-
-rust_test_host {
-    name: "tokio_host_test_tests_process_issue_42",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/process_issue_42.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_process_issue_42",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/process_issue_42.rs"],
-}
-
-rust_test_host {
-    name: "tokio_host_test_tests_process_smoke",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/process_smoke.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_process_smoke",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/process_smoke.rs"],
-}
-
-rust_test_host {
     name: "tokio_host_test_tests_rt_basic",
     defaults: ["tokio_defaults"],
     srcs: ["tests/rt_basic.rs"],
@@ -424,111 +350,6 @@ rust_test {
 }
 
 rust_test_host {
-    name: "tokio_host_test_tests_signal_ctrl_c",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_ctrl_c.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_signal_ctrl_c",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_ctrl_c.rs"],
-}
-
-rust_test_host {
-    name: "tokio_host_test_tests_signal_drop_rt",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_drop_rt.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_signal_drop_rt",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_drop_rt.rs"],
-}
-
-rust_test_host {
-    name: "tokio_host_test_tests_signal_drop_signal",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_drop_signal.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_signal_drop_signal",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_drop_signal.rs"],
-}
-
-rust_test_host {
-    name: "tokio_host_test_tests_signal_multi_rt",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_multi_rt.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_signal_multi_rt",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_multi_rt.rs"],
-}
-
-rust_test_host {
-    name: "tokio_host_test_tests_signal_no_rt",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_no_rt.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_signal_no_rt",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_no_rt.rs"],
-}
-
-rust_test_host {
-    name: "tokio_host_test_tests_signal_notify_both",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_notify_both.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_signal_notify_both",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_notify_both.rs"],
-}
-
-rust_test_host {
-    name: "tokio_host_test_tests_signal_twice",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_twice.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_signal_twice",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/signal_twice.rs"],
-}
-
-rust_test_host {
     name: "tokio_host_test_tests_sync_barrier",
     defaults: ["tokio_defaults"],
     srcs: ["tests/sync_barrier.rs"],
@@ -604,21 +425,6 @@ rust_test {
 }
 
 rust_test_host {
-    name: "tokio_host_test_tests_sync_once_cell",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/sync_once_cell.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_sync_once_cell",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/sync_once_cell.rs"],
-}
-
-rust_test_host {
     name: "tokio_host_test_tests_sync_rwlock",
     defaults: ["tokio_defaults"],
     srcs: ["tests/sync_rwlock.rs"],
@@ -739,21 +545,6 @@ rust_test {
 }
 
 rust_test_host {
-    name: "tokio_host_test_tests_time_interval",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/time_interval.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_time_interval",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/time_interval.rs"],
-}
-
-rust_test_host {
     name: "tokio_host_test_tests_time_rt",
     defaults: ["tokio_defaults"],
     srcs: ["tests/time_rt.rs"],
@@ -769,21 +560,6 @@ rust_test {
 }
 
 rust_test_host {
-    name: "tokio_host_test_tests_time_timeout",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/time_timeout.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_time_timeout",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/time_timeout.rs"],
-}
-
-rust_test_host {
     name: "tokio_host_test_tests_uds_split",
     defaults: ["tokio_defaults"],
     srcs: ["tests/uds_split.rs"],
@@ -797,18 +573,3 @@ rust_test {
     defaults: ["tokio_defaults"],
     srcs: ["tests/uds_split.rs"],
 }
-
-rust_test_host {
-    name: "tokio_host_test_tests_uds_stream",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/uds_stream.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "tokio_device_test_tests_uds_stream",
-    defaults: ["tokio_defaults"],
-    srcs: ["tests/uds_stream.rs"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index fd9e265..686fbda 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -23,12 +23,6 @@
       "name": "tokio_device_test_tests_buffered"
     },
     {
-      "name": "tokio_device_test_tests_fs_file"
-    },
-    {
-      "name": "tokio_device_test_tests_fs_link"
-    },
-    {
       "name": "tokio_device_test_tests_io_async_read"
     },
     {
@@ -71,42 +65,12 @@
       "name": "tokio_device_test_tests_no_rt"
     },
     {
-      "name": "tokio_device_test_tests_process_issue_2174"
-    },
-    {
-      "name": "tokio_device_test_tests_process_issue_42"
-    },
-    {
-      "name": "tokio_device_test_tests_process_smoke"
-    },
-    {
       "name": "tokio_device_test_tests_rt_basic"
     },
     {
       "name": "tokio_device_test_tests_rt_threaded"
     },
     {
-      "name": "tokio_device_test_tests_signal_ctrl_c"
-    },
-    {
-      "name": "tokio_device_test_tests_signal_drop_rt"
-    },
-    {
-      "name": "tokio_device_test_tests_signal_drop_signal"
-    },
-    {
-      "name": "tokio_device_test_tests_signal_multi_rt"
-    },
-    {
-      "name": "tokio_device_test_tests_signal_no_rt"
-    },
-    {
-      "name": "tokio_device_test_tests_signal_notify_both"
-    },
-    {
-      "name": "tokio_device_test_tests_signal_twice"
-    },
-    {
       "name": "tokio_device_test_tests_sync_barrier"
     },
     {
@@ -122,9 +86,6 @@
       "name": "tokio_device_test_tests_sync_mutex_owned"
     },
     {
-      "name": "tokio_device_test_tests_sync_once_cell"
-    },
-    {
       "name": "tokio_device_test_tests_sync_rwlock"
     },
     {
@@ -149,19 +110,10 @@
       "name": "tokio_device_test_tests_tcp_shutdown"
     },
     {
-      "name": "tokio_device_test_tests_time_interval"
-    },
-    {
       "name": "tokio_device_test_tests_time_rt"
     },
     {
-      "name": "tokio_device_test_tests_time_timeout"
-    },
-    {
       "name": "tokio_device_test_tests_uds_split"
-    },
-    {
-      "name": "tokio_device_test_tests_uds_stream"
     }
   ]
 }
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..6c3b89c
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,298 @@
+diff --git a/Android.bp b/Android.bp
+index b654899..44c598d 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -61,6 +61,7 @@ rust_defaults {
+     features: [
+         "bytes",
+         "fs",
++        "full",
+         "io-util",
+         "libc",
+         "macros",
+@@ -108,36 +109,6 @@ rust_test {
+     srcs: ["tests/buffered.rs"],
+ }
+ 
+-rust_test_host {
+-    name: "tokio_host_test_tests_fs_file",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/fs_file.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_fs_file",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/fs_file.rs"],
+-}
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_fs_link",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/fs_link.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_fs_link",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/fs_link.rs"],
+-}
+-
+ rust_test_host {
+     name: "tokio_host_test_tests_io_async_read",
+     defaults: ["tokio_defaults"],
+@@ -348,51 +319,6 @@ rust_test {
+     srcs: ["tests/no_rt.rs"],
+ }
+ 
+-rust_test_host {
+-    name: "tokio_host_test_tests_process_issue_2174",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/process_issue_2174.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_process_issue_2174",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/process_issue_2174.rs"],
+-}
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_process_issue_42",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/process_issue_42.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_process_issue_42",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/process_issue_42.rs"],
+-}
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_process_smoke",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/process_smoke.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_process_smoke",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/process_smoke.rs"],
+-}
+-
+ rust_test_host {
+     name: "tokio_host_test_tests_rt_basic",
+     defaults: ["tokio_defaults"],
+@@ -423,111 +349,6 @@ rust_test {
+     srcs: ["tests/rt_threaded.rs"],
+ }
+ 
+-rust_test_host {
+-    name: "tokio_host_test_tests_signal_ctrl_c",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_ctrl_c.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_signal_ctrl_c",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_ctrl_c.rs"],
+-}
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_signal_drop_rt",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_drop_rt.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_signal_drop_rt",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_drop_rt.rs"],
+-}
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_signal_drop_signal",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_drop_signal.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_signal_drop_signal",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_drop_signal.rs"],
+-}
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_signal_multi_rt",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_multi_rt.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_signal_multi_rt",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_multi_rt.rs"],
+-}
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_signal_no_rt",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_no_rt.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_signal_no_rt",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_no_rt.rs"],
+-}
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_signal_notify_both",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_notify_both.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_signal_notify_both",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_notify_both.rs"],
+-}
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_signal_twice",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_twice.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_signal_twice",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/signal_twice.rs"],
+-}
+-
+ rust_test_host {
+     name: "tokio_host_test_tests_sync_barrier",
+     defaults: ["tokio_defaults"],
+@@ -603,21 +424,6 @@ rust_test {
+     srcs: ["tests/sync_mutex_owned.rs"],
+ }
+ 
+-rust_test_host {
+-    name: "tokio_host_test_tests_sync_once_cell",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/sync_once_cell.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_sync_once_cell",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/sync_once_cell.rs"],
+-}
+-
+ rust_test_host {
+     name: "tokio_host_test_tests_sync_rwlock",
+     defaults: ["tokio_defaults"],
+@@ -738,21 +544,6 @@ rust_test {
+     srcs: ["tests/tcp_shutdown.rs"],
+ }
+ 
+-rust_test_host {
+-    name: "tokio_host_test_tests_time_interval",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/time_interval.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_time_interval",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/time_interval.rs"],
+-}
+-
+ rust_test_host {
+     name: "tokio_host_test_tests_time_rt",
+     defaults: ["tokio_defaults"],
+@@ -768,21 +559,6 @@ rust_test {
+     srcs: ["tests/time_rt.rs"],
+ }
+ 
+-rust_test_host {
+-    name: "tokio_host_test_tests_time_timeout",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/time_timeout.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_time_timeout",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/time_timeout.rs"],
+-}
+-
+ rust_test_host {
+     name: "tokio_host_test_tests_uds_split",
+     defaults: ["tokio_defaults"],
+@@ -797,18 +573,3 @@ rust_test {
+     defaults: ["tokio_defaults"],
+     srcs: ["tests/uds_split.rs"],
+ }
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_uds_stream",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/uds_stream.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_uds_stream",
+-    defaults: ["tokio_defaults"],
+-    srcs: ["tests/uds_stream.rs"],
+-}