tests: Merge from main to local branch

Merge branch 'main' of github.com:project-ocre/ocre-runtime into test-implement-modbus-server-testing

Includes moving changes from tests.yml to build.yml

Signed-off-by: Matthew Gee <mgee@iol.unh.edu>

Author: mgeeIOL

.github/workflows/build.yml

@@ -136,11 +136,11 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: ocre-zephyr-b_u585i_iot02a-app
-          
+
       - name: Flash b_u585i_iot02a
         if: runner.environment == 'self-hosted'
         run: |
-          STM32_Programmer_CLI -c port=swd -w zephyr.bin 0x08000000 -v -rst
+          STM32_Programmer_CLI -c port=swd -e all -w zephyr.bin 0x08000000 -v -rst
 
   build-and-run-linux-sample:
     runs-on: ubuntu-latest
@@ -316,3 +316,47 @@ jobs:
             echo "[FAIL] ${{ matrix.sample.name }} did not produce expected log: ${{ matrix.sample.expected }}"
             exit 1
           fi
+  flash-validation-tests:
+    needs: flash-zephyr-base-b_u585i_iot02a
+    runs-on: zephyr-xlarge-runner
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Flash Validation Tests
+        run: |
+          cd tests && bash beginTests.sh "flashValidation"
+
+      - name: Print Flash Validation Logs
+        if: always()
+        run: cat /tmp/flashValidation.log
+
+      - name: Upload log file as artifact
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: "FlashValidation.log"
+          path: /tmp/flashValidation.log
+
+  modbus-server-validation-tests:
+    needs: flash-zephyr-base-b_u585i_iot02a
+    runs-on: zephyr-xlarge-runner
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Modbus Validation Tests
+        run: |
+          cd tests && bash beginTests.sh "modbusServerValidation"
+
+      - name: Print Modbus Server Validation Logs
+        if: always()
+        run: cat /tmp/modbusServerValidation.log
+
+      - name: Upload log file as artifact
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+            name: "ModbusServerValidation.log"
+            path: /tmp/modbusServerValidation.log
+      

.github/workflows/tests.yml

@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 LOG_MODULE_DECLARE(ocre_cs_component, OCRE_LOG_LEVEL);
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include "../../../../../wasm-micro-runtime/core/iwasm/include/lib_export.h"
 #include "bh_log.h"
 #include "../ocre_timers/ocre_timer.h"

src/ocre/api/ocre_common.c

@@ -15,9 +15,9 @@
 #include <zephyr/device.h>
 #include <zephyr/kernel/mm.h>
 
-#include <version.h>
-#include <app_version.h>
-#include <autoconf.h>
+#include <zephyr/version.h>
+#include <zephyr/app_version.h>
+#include <zephyr/autoconf.h>
 
 // clang-format off
 

src/shared/platform/zephyr/core_internal.h

@@ -15,14 +15,6 @@
           {
             "name": "Check Runtime Hello World",
             "exec": "./flash_validation_hello_world.py"
-          },
-          {
-            "name": "Check Runetime Error",
-            "exec": "./flash_validation_error.py"
-          },
-          {
-            "name": "Check Runtime Hello World With Error",
-            "exec": "./flash_validation_hello_world_error.py"
           }
         ]
       }
@@ -33,4 +25,4 @@
         "exec": "bash clean.sh"
       }
     ]
-  }
+  }

tests/groups/flashValidation/config.json

@@ -12,21 +12,32 @@
 """
 
 def main():
-    conn = serial.Serial('/dev/ttyACM0', 115200, timeout=1)
-    conn.send_break(duration=1)
+    conn = serial.Serial('/dev/ttyACM0', 115200, timeout=10)
+
+    print('**** WAITING FOR SYSTEM TO FULLY INITIALIZE ****\n')
+
+    # Wait for the system to boot and initialize completely
+    # We need to wait for network initialization and OCRE runtime startup
+    time.sleep(5)
 
-    time.sleep(1)
+    # Clear any existing data in the buffer
+    conn.reset_input_buffer()
+
+    # Send break to get current output
+    conn.send_break(duration=1)
+    time.sleep(10)
 
     print('**** READING RESPONSE FROM BREAK ****\n')
 
-    response = conn.read(1024).decode(errors='ignore')
+    # Read response with longer timeout to capture all output
+    response = conn.read(2048).decode(errors='ignore')
     print(response)
 
     print('**** CLOSING CONNECTION ****\n')
 
     conn.close()
 
-    if "Hello World!" in response:
+    if "Hello World from Ocre!" in response:
         sys.exit(0)
     sys.exit(1)