libqtdbustest: 0.3.2 -> 0.4.0
Includes fix for CMake 4 compatibility
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
gitUpdater,
|
||||
testers,
|
||||
cmake,
|
||||
cmake-extras,
|
||||
@@ -17,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libqtdbustest";
|
||||
version = "0.3.2";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/libqtdbustest";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-yqqyKxsbqiVTrkas79YoPMi28dKFNntiE7+dx1v+Qh4=";
|
||||
hash = "sha256-49YIkaQ2ceJxaPLkzOg+L3bwiPzoB36xU7skRh4vYQg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -90,11 +91,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
passthru = {
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for testing DBus interactions using Qt";
|
||||
homepage = "https://launchpad.net/libqtdbustest";
|
||||
homepage = "https://gitlab.com/ubports/development/core/libqtdbustest";
|
||||
license = licenses.lgpl3Only;
|
||||
platforms = platforms.unix;
|
||||
teams = [ teams.lomiri ];
|
||||
|
||||
@@ -70,18 +70,3 @@ diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestQProcessDBusSe
|
||||
+ "python3",
|
||||
QStringList() << "-m" << "dbusmock" << "not.test.name"
|
||||
<< "/test/object" << "test.Interface");
|
||||
|
||||
diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestSuicidalProcess.cpp b/tests/libqtdbustest/TestSuicidalProcess.cpp
|
||||
--- a/tests/libqtdbustest/TestSuicidalProcess.cpp 2023-01-20 21:36:16.948292559 +0100
|
||||
+++ b/tests/libqtdbustest/TestSuicidalProcess.cpp 2023-01-20 21:55:07.219951081 +0100
|
||||
@@ -51,9 +51,7 @@
|
||||
pgrep.waitForFinished();
|
||||
pgrep.waitForReadyRead();
|
||||
|
||||
- EXPECT_TRUE(QString::fromUtf8(pgrep.readAll().trimmed())
|
||||
- .toStdString()
|
||||
- .find("sleep 5") != std::string::npos);
|
||||
+ EXPECT_TRUE(pgrep.readAll().contains("sleep 5"));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
Reference in New Issue
Block a user