tests: Use esp32s2 to test xtensa

esp32 has atomic CAS so not suitable target to test here.
taiki-e · Jun 1, 2024 · e3a22f4 · e3a22f4
1 parent 861ad6f
commit e3a22f4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -499,14 +499,14 @@ jobs:
           sudo mv "opensbi-${OPENSBI_VERSION}-rv-bin/share/opensbi/ilp32/generic/firmware/fw_dynamic.bin" /usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.bin
           sudo mv "opensbi-${OPENSBI_VERSION}-rv-bin/share/opensbi/ilp32/generic/firmware/fw_dynamic.elf" /usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
           rm -rf "opensbi-${OPENSBI_VERSION}-rv-bin"
-      - run: espup install --targets esp32
+      - run: espup install --targets esp32s2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         if: startsWith(matrix.rust, 'nightly')
       - run: tools/no-std.sh
-      - run: tools/build.sh +esp xtensa-esp32-none-elf
+      - run: tools/build.sh +esp xtensa-esp32s2-none-elf
         if: startsWith(matrix.rust, 'nightly')
-      - run: tools/no-std.sh +esp xtensa-esp32-none-elf
+      - run: tools/no-std.sh +esp xtensa-esp32s2-none-elf
         if: startsWith(matrix.rust, 'nightly')
 
   miri:

diff --git a/tests/xtensa/.cargo/config.toml b/tests/xtensa/.cargo/config.toml
@@ -1,2 +1,2 @@
-[target.xtensa-esp32-none-elf]
-runner = "wokwi-server --chip esp32"
+[target.xtensa-esp32s2-none-elf]
+runner = "wokwi-server --chip esp32s2"
diff --git a/tests/xtensa/Cargo.toml b/tests/xtensa/Cargo.toml
@@ -10,10 +10,11 @@ test-helper = { path = "../helper" }
 
 paste = "1"
 
-[target.xtensa-esp32-none-elf.dependencies]
-esp-println = { version = "0.9", default-features = false, features = ["uart", "esp32"] }
-esp32-hal = "0.18"
-xtensa-lx-rt = { version = "0.16", features = ["esp32"] }
+[target.xtensa-esp32s2-none-elf.dependencies]
+esp-println = { version = "0.9", default-features = false, features = ["uart", "esp32s2"] }
+esp-hal = { version = "0.17", features = ["esp32s2"] }
+xtensa-lx-rt = { version = "0.16", features = ["esp32s2"] }
+spin = { version = "0.9", features = ["portable_atomic"] } # used in xtensa-lx-rt
 
 [workspace]
 resolver = "2"
@@ -33,3 +34,6 @@ opt-level = 'z'
 
 [profile.release]
 opt-level = 'z'
+
+[patch.crates-io]
+portable-atomic = { path = "../.." } # used in spin via xtensa-lx-rt
diff --git a/tests/xtensa/src/main.rs b/tests/xtensa/src/main.rs
@@ -10,7 +10,7 @@ mod helper;
 
 use portable_atomic::*;
 
-use esp32_hal as _;
+use esp_hal as _;
 use esp_println::{print, println};
 
 #[xtensa_lx_rt::entry]
@@ -82,6 +82,8 @@ fn main() -> ! {
     test_atomic_float!(f32);
     test_atomic_float!(f64);
 
+    println!("all tests passed");
+
     #[allow(clippy::empty_loop)] // this test crate is #![no_std]
     loop {}
 }