Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-06 21:34:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed compilation of unit tests

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7682 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-11-15 19:47:59 +00:00
parent cefa8000a1
commit c9881d92a6
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/unittests/libretroshare/serialiser/rsmsgitem_test.cc
View file

@ -27,6 +27,7 @@
#include "util/rsrandom.h" #include "util/rsrandom.h"
#include "serialiser/rsmsgitems.h" #include "serialiser/rsmsgitems.h"
#include "chat/rschatitems.h"
#include "support.h" #include "support.h"
#include "rstlvutil.h" #include "rstlvutil.h"

8
tests/unittests/libretroshare/services/gxs/GxsPeerNode.cc
View file

@ -312,13 +312,7 @@ bool GxsPeerNode::createCircle(const std::string &name,
std::cerr << std::endl; std::cerr << std::endl;
uint32_t token; uint32_t token;
if (!mGxsCircles->createGroup(token, grp1)) mGxsCircles->createGroup(token, grp1) ;
{
std::cerr << "GxsPeerNode::createCircle() failed";
std::cerr << std::endl;
return false;
}
while(tokenService->requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE) while(tokenService->requestStatus(token) != RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE)
{ {

19
tests/unittests/unittests.pro
View file

@ -30,13 +30,28 @@ linux-* {
LIBS += -lssl -lupnp -lixml -lXss -lgnome-keyring LIBS += -lssl -lupnp -lixml -lXss -lgnome-keyring
LIBS *= -lcrypto -ldl -lX11 -lz LIBS *= -lcrypto -ldl -lX11 -lz
gxs {
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database. # We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
SQLCIPHER_OK = $$system(pkg-config --exists sqlcipher && echo yes)
isEmpty(SQLCIPHER_OK) {
# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
! exists(../../../lib/sqlcipher/.libs/libsqlcipher.a) {
message(../../../lib/sqlcipher/.libs/libsqlcipher.a does not exist)
error(Please fix this and try again. Will stop now.)
} }
LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
INCLUDEPATH += ../../../lib/sqlcipher/src/
INCLUDEPATH += ../../../lib/sqlcipher/tsrc/
} else {
LIBS += -lsqlcipher
}
LIBS *= -lglib-2.0 LIBS *= -lglib-2.0
LIBS *= -rdynamic LIBS *= -rdynamic
DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions