Merge pull request #222 from ed-xmos/feature/fix_tests

Fix RTOS test failures
xmos · Nov 15, 2023 · 38676bc · 38676bc
2 parents 13b2ef4 + d17f0c3
commit 38676bc
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/test/rtos_drivers/clock_control/check_clock_control.sh b/test/rtos_drivers/clock_control/check_clock_control.sh
@@ -53,6 +53,10 @@ elif [ "$UNAME" == "Darwin" ] ; then
     gtimeout ${TIMEOUT_S}s xrun --xscope ${REPO_ROOT}/dist/${FIRMWARE} 2>&1 | tee -a ${REPORT}
 fi
 
+if [[ $? -eq 124 ]]; then
+    echo "ERROR: TEST TIMED OUT after ${TIMEOUT_S} seconds"
+fi
+
 echo "****************"
 echo "* Parse Result *"
 echo "****************"

diff --git a/test/rtos_drivers/hil/check_drivers_hil.sh b/test/rtos_drivers/hil/check_drivers_hil.sh
@@ -27,7 +27,7 @@ done
 # assign vars
 REPORT=testing/test.rpt
 FIRMWARE=dist/test_rtos_driver_hil.xe
-TIMEOUT_S=60
+TIMEOUT_S=100
 if [ ! -z "${@:$OPTIND:1}" ]
 then
     ADAPTER_ID="--adapter-id ${@:$OPTIND:1}"
@@ -53,6 +53,10 @@ elif [ "$UNAME" == "Darwin" ] ; then
     gtimeout ${TIMEOUT_S}s xrun --xscope ${ADAPTER_ID} ${REPO_ROOT}/${FIRMWARE} 2>&1 | tee -a ${REPORT}
 fi
 
+if [[ $? -eq 124 ]]; then
+    echo "ERROR: TEST TIMED OUT after ${TIMEOUT_S} seconds"
+fi
+
 echo "****************"
 echo "* Parse Result *"
 echo "****************"

diff --git a/test/rtos_drivers/hil/src/individual_tests/qspi_flash/local/read_write_read_test.c b/test/rtos_drivers/hil/src/individual_tests/qspi_flash/local/read_write_read_test.c
@@ -104,13 +104,10 @@ static int main_test(qspi_flash_test_ctx_t *ctx)
             {
                 return -1;
             }
-            // TODO: RE-enable the lines below when the cause of the test failure is fixed
-            /* 
             if (read_write_read(ctx->qspi_flash_ctx, addr, 131072) == -1)
             {
                 return -1;
             }
-            */
         }
     }
     #endif

diff --git a/test/rtos_drivers/hil_add/check_drivers_hil_add.sh b/test/rtos_drivers/hil_add/check_drivers_hil_add.sh
@@ -62,6 +62,10 @@ elif [ "$UNAME" == "Darwin" ] ; then
     gtimeout ${TIMEOUT_S}s xrun --xscope ${ADAPTER_ID} ${REPO_ROOT}/${FIRMWARE} 2>&1 | tee -a ${REPORT}
 fi
 
+if [[ $? -eq 124 ]]; then
+    echo "ERROR: TEST TIMED OUT after ${TIMEOUT_S} seconds"
+fi
+
 echo "****************"
 echo "* Parse Result *"
 echo "****************"

diff --git a/test/rtos_drivers/wifi/check_wifi.sh b/test/rtos_drivers/wifi/check_wifi.sh
@@ -69,6 +69,10 @@ elif [ "$UNAME" == "Darwin" ] ; then
     gtimeout ${TIMEOUT_S}s xrun --xscope ${ADAPTER_ID} ${REPO_ROOT}/dist/${FIRMWARE} 2>&1 | tee -a ${REPORT}
 fi
 
+if [[ $? -eq 124 ]]; then
+    echo "ERROR: TEST TIMED OUT after ${TIMEOUT_S} seconds"
+fi
+
 echo "****************"
 echo "* Parse Result *"
 echo "****************"