Refactor twister execution and cleanup logic in samples.sh and unittest.sh

Author: skarg

samples.sh

@@ -25,6 +25,7 @@ rm -rf "$OUTPUT_DIR"
 
 # Run twister with the specified test cases and output directory
 "$TWISTER_EXE" -O "$OUTPUT_DIR" -T "$TEST_CASES_DIR"
+TWISTER_RC=$?
 
 # twister output directory cleanup files we do not archive
 find "$OUTPUT_DIR" -name 'CMakeFiles' -exec rm -rf {} \; 2>/dev/null
@@ -56,7 +57,7 @@ find "$OUTPUT_DIR" -name 'app' -exec rm -rf '{}' \; 2>/dev/null
 echo "Twister samples output cleanup completed successfully."
 
 # Check if twister ran successfully
-if [ $? -eq 0 ]; then
+if [ $TWISTER_RC -eq 0 ]; then
     echo "Twister samples testing completed successfully."
 else
     echo "Twister samples testing failed."

unittest.sh

@@ -22,50 +22,13 @@ OUTPUT_DIR="$SCRIPT_DIR/twister-out.unit_testing"
 
 # Set platform to unit testing to avoid building for ALL platforms
 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_RC=$?
 
 # twister output directory cleanup files we do not archive
 find "$OUTPUT_DIR" -name 'CMakeFiles' -exec rm -rf {} \; 2>/dev/null
@@ -97,7 +60,7 @@ 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 [ $? -eq 0 ]; then
+if [ $TWISTER_RC -eq 0 ]; then
     echo "Twister unit_testing completed successfully."
 else
     echo "Twister unit_testing failed."