Fix tests.

Author: reitermarkus

.github/workflows/on-target.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Build testsuite
         env:
           RUSTFLAGS: -C link-arg=-Tlink.x -D warnings
-        run: cargo build -p testsuite --target thumbv7m-none-eabi --features testsuite/semihosting
+        run: cargo build -p testsuite --target thumbv7m-none-eabi --features semihosting,cortex-m/single-core-critical-section
       - name: Install QEMU
         run: sudo apt-get update && sudo apt-get install qemu qemu-system-arm
       - name: Run testsuite
@@ -51,7 +51,7 @@ jobs:
       - name: Build testsuite
         env:
           RUSTFLAGS: -C link-arg=-Tlink.x -D warnings
-        run: cargo build -p testsuite --target thumbv6m-none-eabi --features testsuite/rtt
+        run: cargo build -p testsuite --target thumbv6m-none-eabi --features rtt,cortex-m/single-core-critical-section
       - name: Upload testsuite binaries
         uses: actions/upload-artifact@v3
         with:

src/lib.rs

@@ -49,7 +49,7 @@ mod macros;
 pub mod asm;
 #[cfg(armv8m)]
 pub mod cmse;
-#[cfg(feature = "single-core-critical-section")]
+#[cfg(all(cortex_m, feature = "single-core-critical-section"))]
 mod critical_section;
 pub mod delay;
 pub mod interrupt;

testsuite/Cargo.toml

@@ -13,6 +13,7 @@ semihosting = ["cortex-m-semihosting", "minitest/semihosting"]
 cortex-m-rt.path = "../cortex-m-rt"
 cortex-m.path = ".."
 minitest.path = "minitest"
+critical-section = "0.2"
 
 [dependencies.rtt-target]
 version = "0.3.1"

testsuite/minitest/macros/src/lib.rs

@@ -215,8 +215,8 @@ fn tests_impl(args: TokenStream, input: TokenStream) -> parse::Result<TokenStrea
         unsafe {
             ::rtt_target::set_print_channel_cs(
                 channels.up.0,
-                &((|arg, f| cortex_m::interrupt::free(|_| f(arg)))
-                    as rtt_target::CriticalSectionFunc),
+                &((|arg, f| ::critical_section::with(|_| f(arg)))
+                    as ::rtt_target::CriticalSectionFunc),
             );
         }
     });