Testing: Set bwos to default to see which tests fail in CI

tokio-rs · May 29, 2023 · c303336 · c303336
1 parent 972fe93
commit c303336
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
@@ -24,7 +24,7 @@ keywords = ["io", "async", "non-blocking", "futures"]
 [features]
 # Include nothing by default
 default = []
-bwos = ["rt-multi-thread"]
+bwos = []
 # enable everything
 full = [
   "fs",
@@ -73,6 +73,7 @@ process = [
 # Includes basic task execution capabilities
 rt = []
 rt-multi-thread = [
+  "bwos",
   "num_cpus",
   "rt",
 ]

diff --git a/tokio/src/runtime/builder.rs b/tokio/src/runtime/builder.rs
@@ -196,7 +196,7 @@ cfg_rt_multi_thread!(
         // There may be more (sub-) variants in the future influencing e.g. queue size
         // or stealing strategy
         /// A Block-based workstealing queue offering better performance
-        #[cfg(all(tokio_unstable, feature = "bwos"))]
+        //#[cfg(all(tokio_unstable, feature = "bwos"))]
         Bwos,
     }
 );
@@ -233,7 +233,7 @@ impl Builder {
         /// Configuration methods can be chained on the return value.
         pub fn new_multi_thread() -> Builder {
             // The number `61` is fairly arbitrary. I believe this value was copied from golang.
-            Builder::new(Kind::MultiThread(MultiThreadFlavor::Default), 61, 61)
+            Builder::new(Kind::MultiThread(MultiThreadFlavor::Bwos), 61, 61)
         }
     }
 

diff --git a/tokio/src/runtime/scheduler/multi_thread/queue.rs b/tokio/src/runtime/scheduler/multi_thread/queue.rs
@@ -16,7 +16,7 @@ pub(crate) fn local<T: 'static>(
 ) {
     match flavor {
         MultiThreadFlavor::Default => tokioq::local(),
-        #[cfg(all(tokio_unstable, feature = "bwos"))]
+        //#[cfg(all(tokio_unstable, feature = "bwos"))]
         MultiThreadFlavor::Bwos => bwosq::local(),
     }
 }

diff --git a/tokio/src/runtime/tests/loom_queue.rs b/tokio/src/runtime/tests/loom_queue.rs
@@ -71,7 +71,7 @@ fn basic_default() {
     basic_flavor(MultiThreadFlavor::Default);
 }
 
-#[cfg(all(tokio_unstable, feature = "bwos"))]
+//#[cfg(all(tokio_unstable, feature = "bwos"))]
 #[test]
 fn basic_bwos() {
     basic_flavor(MultiThreadFlavor::Bwos);
@@ -133,7 +133,7 @@ fn steal_overflow_default() {
     steal_overflow(MultiThreadFlavor::Default)
 }
 
-#[cfg(all(tokio_unstable, feature = "bwos"))]
+//#[cfg(all(tokio_unstable, feature = "bwos"))]
 #[test]
 fn steal_overflow_bwos() {
     steal_overflow(MultiThreadFlavor::Bwos)
@@ -204,7 +204,7 @@ fn multi_stealer_default() {
     multi_stealer_flavor(MultiThreadFlavor::Default)
 }
 
-#[cfg(all(tokio_unstable, feature = "bwos"))]
+//#[cfg(all(tokio_unstable, feature = "bwos"))]
 #[test]
 fn multi_stealer_bwos() {
     multi_stealer_flavor(MultiThreadFlavor::Bwos)
@@ -253,7 +253,7 @@ fn chained_steal_default() {
     chained_steal(MultiThreadFlavor::Default)
 }
 
-#[cfg(all(tokio_unstable, feature = "bwos"))]
+//#[cfg(all(tokio_unstable, feature = "bwos"))]
 #[test]
 fn chained_steal_bwos() {
     chained_steal(MultiThreadFlavor::Bwos)