Replace cross tests with MIRI (#63)

RustCrypto · Sep 12, 2023 · 329d4cd · 329d4cd
1 parent 48cc4ac
commit 329d4cd
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 56 deletions.
diff --git a/.github/actions/cross-tests/action.yml b/.github/actions/cross-tests/action.yml
diff --git a/.github/workflows/ascon.yml b/.github/workflows/ascon.yml
@@ -65,3 +65,28 @@ jobs:
       - run: cargo test --no-default-features
       - run: cargo test
       - run: cargo test --all-features
+
+  miri:
+    runs-on: ubuntu-latest
+    env:
+      MIRIFLAGS: "-Zmiri-symbolic-alignment-check -Zmiri-strict-provenance"
+    strategy:
+      matrix:
+        target:
+          - x86_64-unknown-linux-gnu
+          - s390x-unknown-linux-gnu
+    steps:
+      - uses: actions/checkout@v4
+      - uses: RustCrypto/actions/cargo-cache@master
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly
+      - name: Install Miri
+        run: |
+          rustup component add miri
+          cargo miri setup
+      - name: Test with Miri
+        run: |
+          cargo miri test --target ${{ matrix.target }} --no-default-features
+          cargo miri test --target ${{ matrix.target }}
+          cargo miri test --target ${{ matrix.target }} --all-features
diff --git a/.github/workflows/keccak.yml b/.github/workflows/keccak.yml
@@ -80,36 +80,30 @@ jobs:
       - run: cargo check --features simd
       - run: cargo test --features simd
 
-  # Cross-compiled tests
-  cross:
-    needs: set-msrv
+  miri:
+    runs-on: ubuntu-latest
+    env:
+      MIRIFLAGS: "-Zmiri-symbolic-alignment-check -Zmiri-strict-provenance"
     strategy:
       matrix:
-        rust:
-          - ${{needs.set-msrv.outputs.msrv}}
-          - stable
         target:
-          - i686-unknown-linux-gnu
           - x86_64-unknown-linux-gnu
-          - aarch64-unknown-linux-gnu
-          - powerpc-unknown-linux-gnu
-        features:
-          - no_unroll
-          - 'NO_FEATURE'
-
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-      # Cross mounts only current package, i.e. by default it ignores workspace's Cargo.toml
-        working-directory: .
+          - s390x-unknown-linux-gnu
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/cross-tests
+      - uses: dtolnay/rust-toolchain@master
         with:
-          rust: ${{ matrix.rust }}
-          package: ${{ github.workflow }}
-          target: ${{ matrix.target }}
-          features: ${{ matrix.features }}
+          toolchain: nightly
+      - name: Install Miri
+        run: |
+          rustup component add miri
+          cargo miri setup
+      - name: Test with Miri
+        run: |
+          cargo miri test --target ${{ matrix.target }} --no-default-features
+          cargo miri test --target ${{ matrix.target }}
+          cargo miri test --target ${{ matrix.target }} --features no_unroll
+          cargo miri test --target ${{ matrix.target }} --features simd
 
   aarch64-sha3:
     needs: set-msrv