gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

poco: seperately disable broken tests on linux and darwin

Browse Source 
poco: Better optionals
This commit is contained in:
‮rekcäH nitraM‮
2025-07-12 22:34:10 +02:00
committed by Martin Häcker
parent da47ff291b
commit 578bb68e7e
3 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/po/poco/disable-broken-tests.patch → pkgs/by-name/po/poco/disable-broken-tests-darwin.patch
View File
pkgs/by-name/po/poco/disable-broken-tests-linux.patch
+28
View File
@@ -0,0 +1,28 @@
diff --git a/Data/testsuite/src/DataTest.cpp b/Data/testsuite/src/DataTest.cpp
index a78c4e5..e8d9335 100644
--- a/Data/testsuite/src/DataTest.cpp
+++ b/Data/testsuite/src/DataTest.cpp
@@ -1652 +1652 @@ CppUnit::Test* DataTest::suite()
- CppUnit_addTest(pSuite, DataTest, testSQLChannel);
+ // CppUnit_addTest(pSuite, DataTest, testSQLChannel);
diff --git a/Net/testsuite/src/DatagramSocketTest.cpp b/Net/testsuite/src/DatagramSocketTest.cpp
index e765de2..cec4867 100644
--- a/Net/testsuite/src/DatagramSocketTest.cpp
+++ b/Net/testsuite/src/DatagramSocketTest.cpp
@@ -830 +830 @@ CppUnit::Test* DatagramSocketTest::suite()
- CppUnit_addTest(pSuite, DatagramSocketTest, testBroadcast);
+ // CppUnit_addTest(pSuite, DatagramSocketTest, testBroadcast);
diff --git a/Net/testsuite/src/SocketReactorTest.cpp b/Net/testsuite/src/SocketReactorTest.cpp
index a07576c..b3236c5 100644
--- a/Net/testsuite/src/SocketReactorTest.cpp
+++ b/Net/testsuite/src/SocketReactorTest.cpp
@@ -706 +706 @@ CppUnit::Test* SocketReactorTest::suite()
- CppUnit_addTest(pSuite, SocketReactorTest, testSocketConnectorFail);
+ // CppUnit_addTest(pSuite, SocketReactorTest, testSocketConnectorFail);
diff --git a/Net/testsuite/src/SocketTest.cpp b/Net/testsuite/src/SocketTest.cpp
index 27c1800..9bd684b 100644
--- a/Net/testsuite/src/SocketTest.cpp
+++ b/Net/testsuite/src/SocketTest.cpp
@@ -900 +900 @@ CppUnit::Test* SocketTest::suite()
- CppUnit_addTest(pSuite, SocketTest, testEchoUnixLocal);
+ // CppUnit_addTest(pSuite, SocketTest, testEchoUnixLocal);
pkgs/by-name/po/poco/package.nix
+21 -13
View File
@@ -56,13 +56,16 @@ stdenv.mkDerivation rec {
cmakeFlags =
let
# These tests require running services, which the checkPhase is ill equipeed to provide
# TODO get them running in a nixosTest
excludeTestsRegex = lib.concatStringsSep "|" [
# These tests require running services, which the checkPhase is ill equipeed to provide
# TODO get them running in a nixosTest
"Redis"
"DataODBC"
"MongoDB"
"DataMySQL"
# network not accessible from nix sandbox
"NetSSL" # around 25 test failures
"Net" # could be made to work when public network access is patched out
];
in
[
@@ -72,17 +75,22 @@ stdenv.mkDerivation rec {
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'${excludeTestsRegex}'")
];
patches = [
# Remove on next release
(fetchpatch {
name = "disable-included-pcre-if-pcre-is-linked-staticly";
# this happens when building pkgsStatic.poco
url = "https://patch-diff.githubusercontent.com/raw/pocoproject/poco/pull/4879.patch";
hash = "sha256-VFWuRuf0GPYFp43WKI8utl+agP+7a5biLg7m64EMnVo=";
})
# failing on darwin, could perhaps be patched / a fix upstreamed later
./disable-broken-tests.patch
];
patches =
[
# Remove on next release
(fetchpatch {
name = "disable-included-pcre-if-pcre-is-linked-staticly";
# this happens when building pkgsStatic.poco
url = "https://patch-diff.githubusercontent.com/raw/pocoproject/poco/pull/4879.patch";
hash = "sha256-VFWuRuf0GPYFp43WKI8utl+agP+7a5biLg7m64EMnVo=";
})
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
./disable-broken-tests-darwin.patch
]
++ lib.optionals stdenv.hostPlatform.isLinux [
./disable-broken-tests-linux.patch
];
doCheck = true;
preCheck = ''