Merge pull request #3077 from MirServer/coverage-performance

coverage: actually run performance tests
canonical · Oct 18, 2023 · 182bf7c · 182bf7c
2 parents 1d57c1d + 0090033
commit 182bf7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -55,8 +55,12 @@ jobs:
         sudo apt-add-repository --yes ppa:mir-team/dev
         sudo apt-get install --no-install-recommends \
           dmz-cursor-theme \
+          glmark2-es2 \
+          glmark2-es2-wayland \
           lcov \
-          ninja-build
+          mesa-utils \
+          ninja-build \
+          xwayland
 
         # deal with incompataibles preinstalled
         sudo apt-get remove --yes \
@@ -84,7 +88,7 @@ jobs:
       run: ccache --show-stats --zero-stats
 
     - name: Test
-      timeout-minutes: 5
+      timeout-minutes: 10
       env:
         CTEST_OUTPUT_ON_FAILURE: 1
         XDG_RUNTIME_DIR: /tmp

diff --git a/tests/performance-tests/CMakeLists.txt b/tests/performance-tests/CMakeLists.txt
@@ -18,12 +18,13 @@ install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mir-smoke-test-runner
     DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
+find_program(EGLINFO_EXECUTABLE eglinfo)
 find_program(XVFB_RUN_EXECUTABLE xvfb-run)
 find_program(GLMARK2_EXECUTABLE glmark2-es2-wayland)
 
 CMAKE_DEPENDENT_OPTION(
   MIR_RUN_SMOKE_TESTS "Run mir-smoke-test-runner as part of testsuite" ON
-  "XVFB_RUN_EXECUTABLE" OFF
+  "EGLINFO_EXECUTABLE;XVFB_RUN_EXECUTABLE" OFF
 )
 
 CMAKE_DEPENDENT_OPTION(