Refactor twister scripts for improved environment handling and cleanup messages

Author: skarg

samples.sh

@@ -1,10 +1,19 @@
 #!/bin/bash
+# Set the path to the twister executable
+TWISTER_EXE=""
+
+# Set workspace virtual environment if available
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+WORKSPACE_VENV="$SCRIPT_DIR/../.venv"
 WORKSPACE_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
-
-# Set the path to the twister executable
 TWISTER_EXE="$WORKSPACE_DIR/zephyr/scripts/twister"
 
+if [ -x "$WORKSPACE_VENV/bin/python3" ]; then
+    VENV_SITE="$($WORKSPACE_VENV/bin/python3 -c 'import site; print(site.getsitepackages()[0])')"
+    export PATH="$WORKSPACE_VENV/bin:$PATH"
+    export PYTHONPATH="$VENV_SITE${PYTHONPATH:+:$PYTHONPATH}"
+fi
+
 # Set the path to the test cases directory
 TEST_CASES_DIR="$SCRIPT_DIR/zephyr/samples"
 
@@ -44,12 +53,12 @@ find "$OUTPUT_DIR" -name 'app' -exec rm -rf \
     {}/../cmake_install.cmake
     {}/../CMakeCache.txt' \; 2>/dev/null
 find "$OUTPUT_DIR" -name 'app' -exec rm -rf '{}' \; 2>/dev/null
-echo "Twister output cleanup completed successfully."
+echo "Twister samples output cleanup completed successfully."
 
 # Check if twister ran successfully
 if [ $? -eq 0 ]; then
-    echo "Twister testing completed successfully."
+    echo "Twister samples testing completed successfully."
 else
-    echo "Twister testing failed."
+    echo "Twister samples testing failed."
     exit 1
 fi

unittest.sh

@@ -16,67 +16,49 @@ fi
 
 # Set the path to the test cases directory
 TEST_CASES_DIR="$SCRIPT_DIR/zephyr/tests"
-NATIVE_SIM_TEST_CASES_DIR="$SCRIPT_DIR/zephyr/tests/subsys/bacnet_settings"
 
 # Set the output directory for test results
 OUTPUT_DIR="$SCRIPT_DIR/twister-out.unit_testing"
-NATIVE_SIM_OUTPUT_DIR="$SCRIPT_DIR/twister-out.native_sim"
-
-TWISTER_PLATFORM="unit_testing"
-NATIVE_SIM_PLATFORM="native_sim"
-
-cleanup_twister_output_dir() {
-    local output_dir="$1"
-
-    find "$output_dir" -name 'CMakeFiles' -exec rm -rf {} \; 2>/dev/null
-    find "$output_dir" -name 'modules' -exec rm -rf {} \; 2>/dev/null
-    find "$output_dir" -name 'app' -exec rm -rf \
-        '{}/../zephyr/arch
-        {}/../zephyr/boards
-        {}/../zephyr/cmake
-        {}/../zephyr/CMakeFiles
-        {}/../zephyr/dev_graph.dot
-        {}/../zephyr/drivers
-        {}/../zephyr/dts.cmake
-        {}/../zephyr/edt.pickle
-        {}/../zephyr/include
-        {}/../zephyr/isrList.bin
-        {}/../zephyr/kconfig
-        {}/../zephyr/kernel
-        {}/../zephyr/lib
-        {}/../zephyr/libzephyr.a
-        {}/../zephyr/misc
-        {}/../zephyr/modules
-        {}/../zephyr/soc
-        {}/../zephyr/subsys
-        {}/../Makefile
-        {}/../Kconfig
-        {}/../cmake_install.cmake
-        {}/../CMakeCache.txt' \; 2>/dev/null
-    find "$output_dir" -name 'app' -exec rm -rf '{}' \; 2>/dev/null
-}
 
 # Remove the output directory
 rm -rf "$OUTPUT_DIR"
-rm -rf "$NATIVE_SIM_OUTPUT_DIR"
 
 # Run twister with the specified test cases and output directory
-"$TWISTER_EXE" -O "$OUTPUT_DIR" -p "$TWISTER_PLATFORM" -T "$TEST_CASES_DIR"
-UNIT_TEST_RC=$?
-
-# Run twister for native_sim-only functional tests
-"$TWISTER_EXE" -O "$NATIVE_SIM_OUTPUT_DIR" -p "$NATIVE_SIM_PLATFORM" -T "$NATIVE_SIM_TEST_CASES_DIR"
-NATIVE_SIM_RC=$?
+"$TWISTER_EXE" -O "$OUTPUT_DIR" -T "$TEST_CASES_DIR"
 
 # twister output directory cleanup files we do not archive
-cleanup_twister_output_dir "$OUTPUT_DIR"
-cleanup_twister_output_dir "$NATIVE_SIM_OUTPUT_DIR"
-echo "Twister output cleanup completed successfully."
+find "$OUTPUT_DIR" -name 'CMakeFiles' -exec rm -rf {} \; 2>/dev/null
+find "$OUTPUT_DIR" -name 'modules' -exec rm -rf {} \; 2>/dev/null
+find "$OUTPUT_DIR" -name 'app' -exec rm -rf \
+    '{}/../zephyr/arch
+    {}/../zephyr/boards
+    {}/../zephyr/cmake
+    {}/../zephyr/CMakeFiles
+    {}/../zephyr/dev_graph.dot
+    {}/../zephyr/drivers
+    {}/../zephyr/dts.cmake
+    {}/../zephyr/edt.pickle
+    {}/../zephyr/include
+    {}/../zephyr/isrList.bin
+    {}/../zephyr/kconfig
+    {}/../zephyr/kernel
+    {}/../zephyr/lib
+    {}/../zephyr/libzephyr.a
+    {}/../zephyr/misc
+    {}/../zephyr/modules
+    {}/../zephyr/soc
+    {}/../zephyr/subsys
+    {}/../Makefile
+    {}/../Kconfig
+    {}/../cmake_install.cmake
+    {}/../CMakeCache.txt' \; 2>/dev/null
+find "$OUTPUT_DIR" -name 'app' -exec rm -rf '{}' \; 2>/dev/null
+echo "Twister unit_testing output cleanup completed successfully."
 
 # Check if twister ran successfully
-if [ $UNIT_TEST_RC -eq 0 ] && [ $NATIVE_SIM_RC -eq 0 ]; then
-    echo "Twister testing completed successfully."
+if [ $? -eq 0 ]; then
+    echo "Twister unit_testing completed successfully."
 else
-    echo "Twister testing failed."
+    echo "Twister unit_testing failed."
     exit 1
 fi