mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
ca15e63490
The unittests were now failing to build with GCC 14 (see: <https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/1144>). * gnu/packages/patches/jami-unittests-fix-build.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/jami.scm (jami) [source]: Apply it. Change-Id: I11eb97663bb28a4153b2459ea886658cf08b6129
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
Upstream-status: https://review.jami.net/c/jami-client-qt/+/31508
|
|
|
|
diff --git a/tests/unittests/previewengine_unittest.cpp b/tests/unittests/previewengine_unittest.cpp
|
|
index f5c103cf..810e621b 100644
|
|
--- a/tests/unittests/previewengine_unittest.cpp
|
|
+++ b/tests/unittests/previewengine_unittest.cpp
|
|
@@ -17,7 +17,8 @@
|
|
|
|
#include "globaltestenvironment.h"
|
|
|
|
-#include <QtHttpServer/QHttpServer>
|
|
+#include <QtHttpServer>
|
|
+#include <QTcpServer>
|
|
|
|
class PreviewEngineFixture : public ::testing::Test
|
|
{
|
|
@@ -27,19 +28,27 @@ public:
|
|
void SetUp() override
|
|
{
|
|
server = new QHttpServer();
|
|
- // Setup a server that can return an HTML body.
|
|
- server->listen(QHostAddress::LocalHost, 8000);
|
|
+ tcpserver = new QTcpServer();
|
|
+
|
|
+ // Setup a server that can return an HTML body, which listens
|
|
+ // on 127.0.0.1 (localhost) and port 8000.
|
|
+ if (!tcpserver->listen(QHostAddress::LocalHost, 8000)
|
|
+ || !server->bind(tcpserver)) {
|
|
+ qFatal() << "failed to listen:" << tcpserver->errorString();
|
|
+ }
|
|
}
|
|
|
|
// Close unit test context. Called
|
|
// after each unit test ending
|
|
void TearDown() override
|
|
{
|
|
+ delete tcpserver;
|
|
delete server;
|
|
}
|
|
|
|
// An instance of QHttpServer used to create a server.
|
|
QHttpServer* server;
|
|
+ QTcpServer* tcpserver;
|
|
};
|
|
|
|
/*!
|