Merge #676

676: test patched STM32 r=Emilgardis a=burrbull



Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

.github/workflows/ci.yml

@@ -68,6 +68,7 @@ jobs:
           - { rust: stable, vendor: SiliconLabs, options: "" }
           - { rust: stable, vendor: Spansion, options: "" }
           - { rust: stable, vendor: STMicro, options: "" }
+          - { rust: stable, vendor: STM32-patched, options: "--strict --const_generic --derive_more --pascal_enum_values --max_cluster_size" }
           - { rust: stable, vendor: Toshiba, options: all }
           - { rust: stable, vendor: Toshiba, options: "" }
           # Test MSRV

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- Test patched STM32
 - simplify ci strategy
 
 ## [v0.27.1] - 2022-10-25

ci/script.sh

@@ -1,29 +1,19 @@
 set -euxo pipefail
 
 test_svd() {
-    (
-        cd $td &&
-            curl -LO \
-                 https://raw.githubusercontent.com/posborne/cmsis-svd/master/data/$VENDOR/${1}.svd
-    )
-
-    # NOTE we care about errors in svd2rust, but not about errors / warnings in rustfmt
-    pushd $td
-    RUST_BACKTRACE=1 svd2rust $options -i ${1}.svd
-
-    mv lib.rs src/lib.rs
-
-    popd
+    test_svd_for_target cortex-m https://raw.githubusercontent.com/posborne/cmsis-svd/master/data/$VENDOR/${1}.svd
+}
 
-    cargo $COMMAND --manifest-path $td/Cargo.toml
+test_patched_stm32() {
+    test_svd_for_target cortex-m https://stm32-rs.github.io/stm32-rs/${1}.svd.patched
 }
 
 test_svd_for_target() {
     curl -L --output $td/input.svd $2
 
     # NOTE we care about errors in svd2rust, but not about errors / warnings in rustfmt
     pushd $td
-    RUST_BACKTRACE=1 svd2rust $options --target $1 -i input.svd
+    RUST_BACKTRACE=1 svd2rust $options --target $1 --source_type xml -i input.svd
 
     mv lib.rs src/lib.rs
 
@@ -558,6 +548,25 @@ main() {
             # test_svd STM32L063x
         ;;
 
+        STM32-patched)
+            # OK
+            test_patched_stm32 stm32f0x2
+            test_patched_stm32 stm32f103
+            test_patched_stm32 stm32f411
+            test_patched_stm32 stm32f469
+            test_patched_stm32 stm32f7x3
+            test_patched_stm32 stm32g070
+            test_patched_stm32 stm32g473
+            test_patched_stm32 stm32h743
+            test_patched_stm32 stm32l0x3
+            test_patched_stm32 stm32l162
+            test_patched_stm32 stm32l4x6
+            test_patched_stm32 stm32l562
+            test_patched_stm32 stm32mp157
+            test_patched_stm32 stm32wb55
+            test_patched_stm32 stm32wle5
+        ;;
+
         Toshiba)
             # BAD-SVD resetValue is bigger than the register size
             # test_svd M365