Fix the philosopher test for Renode

.github/workflows/build.yml

@@ -22,6 +22,9 @@ jobs:
       matrix:
         os: [ubuntu-22.04]
     runs-on: ${{ matrix.os }}
+    env:
+      WGET_ARGS: "-q"
+      RENODE_VERSION: "1.15.3"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -50,6 +53,19 @@ jobs:
           rustup target add thumbv7m-none-eabi
           rustup target add thumbv8m.main-none-eabi
 
+      # Note that Renode is only provided for x86_64 targets.  This matches the github runners.
+      - name: Install Renode
+        shell: bash
+        run: |
+          set -e
+          sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+          echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
+          sudo apt-get -y update
+          wget ${WGET_ARGS} https://github.com/renode/renode/releases/download/v${RENODE_VERSION}/renode_${RENODE_VERSION}_amd64.deb
+          sudo apt-get install -y ./renode_${RENODE_VERSION}_amd64.deb
+          rm renode_${RENODE_VERSION}_amd64.deb
+          pip3 install -r /opt/renode/tests/requirements.txt --no-cache-dir
+
       - name: Build firmware
         working-directory: apptest
         shell: bash
@@ -60,4 +76,5 @@ jobs:
           df -h
 
           west twister -M all -T samples -T tests -v --inline-logs --integration -j 4 \
+             --timeout-multiplier 2 \
              $(cat etc/platforms.txt)

etc/platforms.txt

@@ -6,3 +6,4 @@
 -p qemu_riscv32/qemu_virt_riscv32/smp
 -p qemu_riscv64
 -p qemu_riscv64/qemu_virt_riscv64/smp
+-p m2gl025_miv

samples/philosophers/sample.yaml

@@ -8,7 +8,7 @@ common:
     regex:
       # Match the statistics, and make sure that each philosopher has at least 10 (two digits)
       # meals.
-      - "^\\[\\d{2,}, \\d{2,}, \\d{2,}, \\d{2,}, \\d{2,}, \\d{2,}\\]"
+      - "c:\\[\\d{2,}, \\d{2,}, \\d{2,}, \\d{2,}, \\d{2,}, \\d{2,}\\]"
   tags: rust
   filter: CONFIG_RUST_SUPPORTED
 tests:

samples/philosophers/src/lib.rs

@@ -202,7 +202,7 @@ impl Stats {
     }
 
     fn show(&self) {
-        printkln!("{:?}, e:{:?}, t:{:?}", self.count, self.eating, self.thinking);
+        printkln!("c:{:?}, e:{:?}, t:{:?}", self.count, self.eating, self.thinking);
     }
 }