mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-20 03:59:30 +03:00
lomiri.libusermetrics: Disable flaky test
This commit is contained in:
parent
992539aa65
commit
174b65ab37
@ -0,0 +1,37 @@
|
|||||||
|
From 52ac1d6548b4a92d569c5d2f53b84c604c7fce8a Mon Sep 17 00:00:00 2001
|
||||||
|
From: OPNA2608 <opna2608@protonmail.com>
|
||||||
|
Date: Thu, 1 Feb 2024 22:42:39 +0100
|
||||||
|
Subject: [PATCH] Remove custom check target
|
||||||
|
|
||||||
|
The automatic one provides better controls for us
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 7 +------
|
||||||
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index af643a7..75b3cc1 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -105,18 +105,13 @@ add_subdirectory("data")
|
||||||
|
|
||||||
|
|
||||||
|
if(ENABLE_TESTS)
|
||||||
|
-enable_testing()
|
||||||
|
+include(CTest)
|
||||||
|
|
||||||
|
pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1 REQUIRED)
|
||||||
|
include_directories(${QTDBUSTEST_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
add_subdirectory(tests)
|
||||||
|
|
||||||
|
-ADD_CUSTOM_TARGET(
|
||||||
|
- check
|
||||||
|
- ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
|
||||||
|
-)
|
||||||
|
-
|
||||||
|
find_package(CoverageReport)
|
||||||
|
enable_coverage_report(
|
||||||
|
TARGETS
|
||||||
|
--
|
||||||
|
2.42.0
|
||||||
|
|
@ -40,6 +40,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
"doc"
|
"doc"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Not submitted yet, waiting for decision on how CMake testing should be handled
|
||||||
|
./2001-Remove-custom-check-target.patch
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# Tries to query QMake for QT_INSTALL_QML variable, would return broken paths into /build/qtbase-<commit> even if qmake was available
|
# Tries to query QMake for QT_INSTALL_QML variable, would return broken paths into /build/qtbase-<commit> even if qmake was available
|
||||||
substituteInPlace src/modules/UserMetrics/CMakeLists.txt \
|
substituteInPlace src/modules/UserMetrics/CMakeLists.txt \
|
||||||
@ -87,6 +92,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
(lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
|
(lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
|
||||||
(lib.cmakeBool "GSETTINGS_COMPILE" true)
|
(lib.cmakeBool "GSETTINGS_COMPILE" true)
|
||||||
(lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
|
(lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
|
||||||
|
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [
|
||||||
|
# Exclude tests
|
||||||
|
"-E" (lib.strings.escapeShellArg "(${lib.concatStringsSep "|" [
|
||||||
|
# Flaky, randomly failing in UserMetricsImplTest.AddTranslatedData (data not ready when signal is emitted?)
|
||||||
|
"^usermetricsoutput-unit-tests"
|
||||||
|
]})")
|
||||||
|
]))
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||||
|
Loading…
Reference in New Issue
Block a user