From 7dd4d8a30e41611994f55e7f5c9cf124a1c74e2a Mon Sep 17 00:00:00 2001 From: Qi Date: Wed, 9 Jul 2025 19:52:33 +0800 Subject: [PATCH] runtime: cleanup legacy tests of alt multi-threaded runtime (#7451) Signed-off-by: ADD-SP --- .github/workflows/loom.yml | 25 ------------------------- tokio/tests/rt_common.rs | 34 ---------------------------------- 2 files changed, 59 deletions(-) diff --git a/.github/workflows/loom.yml b/.github/workflows/loom.yml index 234b8bfd7..99dddcc6c 100644 --- a/.github/workflows/loom.yml +++ b/.github/workflows/loom.yml @@ -95,28 +95,3 @@ jobs: working-directory: tokio env: SCOPE: ${{ matrix.scope }} - - loom-multi-thread-alt: - name: loom ALT multi-thread scheduler - # base_ref is null when it's not a pull request - if: github.repository_owner == 'tokio-rs' && (contains(github.event.pull_request.labels.*.name, 'R-loom-multi-thread-alt') || (github.base_ref == null)) - runs-on: ubuntu-latest - strategy: - matrix: - include: - - scope: loom_multi_thread_alt::group_a - - scope: loom_multi_thread_alt::group_b - - scope: loom_multi_thread_alt::group_c - - scope: loom_multi_thread_alt::group_d - steps: - - uses: actions/checkout@v4 - - name: Install Rust ${{ env.rust_stable }} - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ env.rust_stable }} - - uses: Swatinem/rust-cache@v2 - - name: loom ${{ matrix.scope }} - run: cargo test --lib --release --features full -- --nocapture $SCOPE - working-directory: tokio - env: - SCOPE: ${{ matrix.scope }} diff --git a/tokio/tests/rt_common.rs b/tokio/tests/rt_common.rs index ab19177ab..6c3ee78a5 100644 --- a/tokio/tests/rt_common.rs +++ b/tokio/tests/rt_common.rs @@ -53,40 +53,6 @@ macro_rules! rt_test { .into() } } - - #[cfg(not(target_os = "wasi"))] // Wasi doesn't support threads - #[cfg(tokio_unstable)] - mod alt_threaded_scheduler_4_threads { - $($t)* - - const NUM_WORKERS: usize = 4; - - fn rt() -> Arc { - tokio::runtime::Builder::new_multi_thread() - .worker_threads(4) - .enable_all() - .build() - .unwrap() - .into() - } - } - - #[cfg(not(target_os = "wasi"))] // Wasi doesn't support threads - #[cfg(tokio_unstable)] - mod alt_threaded_scheduler_1_thread { - $($t)* - - const NUM_WORKERS: usize = 1; - - fn rt() -> Arc { - tokio::runtime::Builder::new_multi_thread() - .worker_threads(1) - .enable_all() - .build() - .unwrap() - .into() - } - } } }