From 8666a40d273a8419b3c805f7d9cf33314ec3000e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sawicz=20=28Saviq=29?= Date: Thu, 12 Oct 2023 11:04:48 +0200 Subject: [PATCH 1/5] tests: add eglinfo dependency --- tests/performance-tests/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/performance-tests/CMakeLists.txt b/tests/performance-tests/CMakeLists.txt index 61645e32cc6..e39ef538c4e 100644 --- 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( From 8fdb360dc33bc13dfa062a5328fcc0d00c198ae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sawicz=20=28Saviq=29?= Date: Thu, 12 Oct 2023 12:00:35 +0200 Subject: [PATCH 2/5] coverage: add missing dependencies --- .github/workflows/coverage.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index ea3e67c7775..803511be2c0 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -55,7 +55,9 @@ jobs: sudo apt-add-repository --yes ppa:mir-team/dev sudo apt-get install --no-install-recommends \ dmz-cursor-theme \ + glmark2-es2-wayland \ lcov \ + mesa-utils \ ninja-build # deal with incompataibles preinstalled From e6231cf0d7d67abc78112810b18ed7f2bc60f1e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sawicz?= Date: Fri, 13 Oct 2023 00:30:10 +0200 Subject: [PATCH 3/5] coverage: xwayland, too --- .github/workflows/coverage.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 803511be2c0..12eac832e81 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -58,7 +58,8 @@ jobs: glmark2-es2-wayland \ lcov \ mesa-utils \ - ninja-build + ninja-build \ + xwayland # deal with incompataibles preinstalled sudo apt-get remove --yes \ From 03e9b34118a797db40254bd765a16ad46dc55f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sawicz?= Date: Fri, 13 Oct 2023 07:13:05 +0200 Subject: [PATCH 4/5] coverage: and glmark2-es2 --- .github/workflows/coverage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 12eac832e81..dee16d33572 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -55,6 +55,7 @@ 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 \ mesa-utils \ From 0090033c267f30546b669eabe3585fd86df4d347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sawicz=20=28Saviq=29?= Date: Fri, 13 Oct 2023 09:41:56 +0200 Subject: [PATCH 5/5] coverage: extend test timeout5 --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index dee16d33572..1ed0edd3599 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -88,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