ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix libguh-core 

add install path for test package
pull/135/head
Simon Stürz 2015-10-30 15:04:40 +01:00 committed by Michael Zanetti
parent 1f0348ad71
commit 3d470bc634
5 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/guh-tests.install vendored
View File

@ -1,2 +1,3 @@
usr/tests/* usr/lib/guh/tests
usr/lib/guh/plugins/libguh_devicepluginmock.so
ust/lib/libguh-core.so

7
tests/auto/autotests.pri
View File

@ -2,7 +2,12 @@ QT += testlib network sql
CONFIG += testcase
DEFINES += TESTING_ENABLED
INCLUDEPATH += $$top_srcdir/server/ $$top_srcdir/server/jsonrpc $$top_srcdir/libguh $$top_srcdir/tests/auto/
INCLUDEPATH += $$top_srcdir/server/ \
$$top_srcdir/server/jsonrpc \
$$top_srcdir/libguh \
$$top_srcdir/tests/auto/
LIBS += -L$$top_builddir/libguh/ -lguh -L$$top_builddir/plugins/deviceplugins/mock/ \
-L$$top_builddir/tests/libguh-core -lguh-core

6
tests/auto/guhtestbase.cpp
View File

@ -31,6 +31,7 @@
#include <QJsonParseError>
#include <QSignalSpy>
#include <QtTest>
#include <QDebug>
#include <QMetaType>
#include <QNetworkReply>
@ -81,6 +82,11 @@ void GuhTestBase::initTestCase()
QVERIFY(spy.isValid());
QVERIFY(spy.wait());
if (MockTcpServer::servers().isEmpty()) {
qWarning() << "no mock tcp server found";
exit(-1);
}
m_mockTcpServer = MockTcpServer::servers().first();
m_clientId = QUuid::createUuid();

2
tests/libguh-core/libguh-core.pro
View File

@ -4,6 +4,8 @@ include(../../server/server.pri)
TARGET = guh-core
TEMPLATE = lib
DEFINES += TESTING_ENABLED
INCLUDEPATH += $$top_srcdir/server/ $$top_srcdir/server/jsonrpc $$top_srcdir/libguh $$top_srcdir/tests/auto/
LIBS += -L$$top_builddir/libguh/ -lguh

1
tests/tests.pro
View File

@ -1,5 +1,4 @@
TEMPLATE = subdirs
SUBDIRS = auto libguh-core
auto.depends = libguh-core