diff --git a/tests/test_graphical_camera_settings.py b/tests/test_graphical_camera_settings.py index 6bf71883..2a63a5b6 100644 --- a/tests/test_graphical_camera_settings.py +++ b/tests/test_graphical_camera_settings.py @@ -22,6 +22,7 @@ import lvgl as lv import mpos.apps import mpos.ui import os +import sys from mpos.ui.testing import ( wait_for_render, capture_screenshot, @@ -33,7 +34,7 @@ from mpos.ui.testing import ( get_widget_coords ) - +@unittest.skipIf(sys.platform == 'darwin', "Camera tests not supported on macOS (no camera available)") class TestGraphicalCameraSettings(unittest.TestCase): """Test suite for Camera app settings verification.""" diff --git a/tests/unittest.sh b/tests/unittest.sh index 586e08df..b7878f9c 100755 --- a/tests/unittest.sh +++ b/tests/unittest.sh @@ -69,7 +69,7 @@ $(cat $file) result = unittest.main() ; sys.exit(0 if result.wasSuccessful() else 1) " result=$? else - # Regular test: no boot files + echo "Regular test: no boot files" "$binary" -X heapsize=8M -c "import sys ; sys.path.insert(0, 'lib') ; import mpos ; mpos.TaskManager.disable() ; $(cat main.py) $(cat $file) result = unittest.main() ; sys.exit(0 if result.wasSuccessful() else 1) " @@ -143,7 +143,11 @@ if [ -z "$onetest" ]; then else echo "doing $onetest" one_test $(readlink -f "$onetest") - [ $? -ne 0 ] && failed=1 + result=$? + if [ $result -ne 0 ]; then + echo "Test returned result: $result" + failed=1 + fi fi