From 3cbea60799a0815114086dd937b5cbfa23293465 Mon Sep 17 00:00:00 2001
From: Ed <ed@xmos.com>
Date: Tue, 14 Nov 2023 17:33:16 +0000
Subject: [PATCH 1/3] Increase timeout in driver/hil test

---
 test/rtos_drivers/hil/check_drivers_hil.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/rtos_drivers/hil/check_drivers_hil.sh b/test/rtos_drivers/hil/check_drivers_hil.sh
index f82ae5c3e..666237515 100755
--- 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}"

From 805b801c457c342ace1aee82423e9366243161e1 Mon Sep 17 00:00:00 2001
From: Ed <ed@xmos.com>
Date: Wed, 15 Nov 2023 08:14:05 +0000
Subject: [PATCH 2/3] Add timeout debug print if timeout occurs

---
 test/rtos_drivers/clock_control/check_clock_control.sh | 4 ++++
 test/rtos_drivers/hil/check_drivers_hil.sh             | 4 ++++
 test/rtos_drivers/hil_add/check_drivers_hil_add.sh     | 4 ++++
 test/rtos_drivers/wifi/check_wifi.sh                   | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/test/rtos_drivers/clock_control/check_clock_control.sh b/test/rtos_drivers/clock_control/check_clock_control.sh
index 3bf3afd71..b86c07fb1 100755
--- 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
index 666237515..645689e39 100755
--- a/test/rtos_drivers/hil/check_drivers_hil.sh
+++ b/test/rtos_drivers/hil/check_drivers_hil.sh
@@ -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_add/check_drivers_hil_add.sh b/test/rtos_drivers/hil_add/check_drivers_hil_add.sh
index 09668f77f..1e4a3d224 100755
--- 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
index 27255df47..7398ab4b1 100755
--- 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 "****************"

From d17f0c3a759637fdbeadbbfaf392ad5b72c5a509 Mon Sep 17 00:00:00 2001
From: Ed <ed@xmos.com>
Date: Wed, 15 Nov 2023 08:59:43 +0000
Subject: [PATCH 3/3] Add back in disabled test

---
 .../individual_tests/qspi_flash/local/read_write_read_test.c   | 3 ---
 1 file changed, 3 deletions(-)

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
index d7731f98f..437bae491 100644
--- 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