fix: ci

Author: developer239

.github/workflows/ci.yml

@@ -18,28 +18,32 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y xvfb libsdl2-dev
+          sudo apt-get install -y xvfb libsdl2-dev x11-xserver-utils xdotool
 
       - name: Configure
         run: |
           mkdir build
           cd build
-          cmake ..
+          cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_HEADLESS_TESTS=ON
 
       - name: Build
         run: |
           cd build
-          cmake --build .
+          cmake --build . --config Release
 
       - name: Run unit tests
         run: |
-          cd build
-          ./tests/RobotCPPTest
+          cd build/bin
+          ./RobotCPPTest
 
-      - name: Run functional tests with Xvfb
+      - name: Run SDL tests with Xvfb
         run: |
-          cd build
-          xvfb-run --auto-servernum --server-args='-screen 0 1280x720x24' ./tests/RobotCPPSDLTest --headless --run-tests
+          cd build/bin
+          Xvfb :99 -screen 0 1280x720x24 &
+          export DISPLAY=:99
+          sleep 2 # Wait for Xvfb to start
+          xset -display :99 s off -dpms  # Disable screen saver
+          ./RobotCPPSDLTest --ci-mode --run-tests
 
   test-macos:
     runs-on: macos-latest
@@ -57,18 +61,24 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake ..
+          cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_HEADLESS_TESTS=ON
 
       - name: Build
         run: |
           cd build
-          cmake --build .
+          cmake --build . --config Release
 
-      - name: Run tests
+      - name: Run unit tests
         run: |
-          cd build
-          ./tests/RobotCPPTest
-          ./tests/RobotCPPSDLTest --headless --run-tests
+          cd build/bin
+          ./RobotCPPTest
+
+      - name: Run SDL tests in CI mode
+        run: |
+          cd build/bin
+          # macOS needs special handling for mouse automation in headless mode
+          # We'll use the CI mode flag we're adding to the test application
+          ./RobotCPPSDLTest --ci-mode --run-tests
 
   test-windows:
     runs-on: windows-latest
@@ -92,17 +102,22 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
+          cmake .. -DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_HEADLESS_TESTS=ON
 
       - name: Build
         shell: powershell
         run: |
           cd build
           cmake --build . --config Release
 
-      - name: Run tests
+      - name: Run unit tests
+        shell: powershell
+        run: |
+          cd build\bin\Release
+          .\RobotCPPTest.exe
+
+      - name: Run SDL tests in CI mode
         shell: powershell
         run: |
-          cd build/tests/Release
-          ./RobotCPPTest.exe
-          ./RobotCPPSDLTest.exe --headless --run-tests
+          cd build\bin\Release
+          .\RobotCPPSDLTest.exe --ci-mode --run-tests

CMakeLists.txt

@@ -5,6 +5,9 @@ project(RobotCPP)
 set(CMAKE_CXX_STANDARD 23)
 set(LIB_NAME RobotCPP)
 
+# Add option for headless tests
+option(BUILD_HEADLESS_TESTS "Configure tests to run in headless/CI environments" OFF)
+
 # Add GoogleTest
 add_subdirectory(externals/googletest)
 enable_testing()
@@ -38,9 +41,19 @@ elseif (WIN32)
     list(APPEND PLATFORM_SOURCES src/EventHookWindows.h)
 endif ()
 
+# If building headless tests, define a preprocessor flag
+if (BUILD_HEADLESS_TESTS)
+    add_compile_definitions(ROBOT_HEADLESS_TESTS)
+endif()
+
 add_library(${LIB_NAME} STATIC ${COMMON_SOURCES} ${PLATFORM_SOURCES} ${SOURCES_LODEPNG})
 target_include_directories(${LIB_NAME} PUBLIC src PRIVATE externals/lodepng)
 target_link_libraries(${LIB_NAME} ${PLATFORM_LIBRARIES})
 
+# Set output directory for all targets
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin)
+
 # Add the tests directory
 add_subdirectory(tests)