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

don't use rpath for the test binaries so we don't need to strip it 

this breaks the make check targets without manually exporting
LD_LIBRARY_PATH, but the make test target still works.
pull/135/head
Michael Zanetti 2014-07-04 23:41:08 +02:00
parent 4b96599b7a
commit 84ef4819d3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guh.pro
View File

@ -17,7 +17,8 @@ doc.commands = cd $$top_srcdir/doc; qdoc config.qdocconf; cp images/mascot.png h
licensecheck.commands = $$top_srcdir/tests/auto/checklicenseheaders.sh $$top_srcdir
test.depends = licensecheck check
test.depends = licensecheck
test.commands = LD_LIBRARY_PATH=$$top_builddir/libguh make check
QMAKE_EXTRA_TARGETS += licensecheck doc test

1
tests/auto/autotests.pri
View File

@ -6,7 +6,6 @@ include($$top_srcdir/server/server.pri)
DEFINES += TESTING_ENABLED
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/ -lguh_devicepluginmock
QMAKE_LFLAGS += -Wl,--rpath=$$top_builddir/libguh
SOURCES += ../guhtestbase.cpp \
../mocktcpserver.cpp \