From 26a1d72ceaa05508fd006d1fe0ee2b2c2692c52a Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 1 Sep 2019 17:40:41 +0200 Subject: [PATCH] Enable the make check target in the dpkg package --- .gitignore | 70 ------------------------------------- tests/testbase/testbase.pri | 3 ++ 2 files changed, 3 insertions(+), 70 deletions(-) diff --git a/.gitignore b/.gitignore index 49d79dc..a1b96ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,75 +1,5 @@ -# This file is used to ignore files which are generated -# ---------------------------------------------------------------------------- - -*~ -*.autosave -*.a -*.core -*.moc -*.o -*.obj -*.orig -*.rej -*.so -*.so.* -*_pch.h.cpp -*_resource.rc -*.qm -.#* -*.*# -core -!core/ -tags -.DS_Store -.directory -*.debug -Makefile* -*.prl -*.app -moc_*.cpp -ui_*.h -qrc_*.cpp -Thumbs.db -*.res -*.rc -/.qmake.cache -/.qmake.stash - -# qtcreator generated files *.pro.user* -# xemacs temporary files -*.flc - -# Vim temporary files -.*.swp - -# Visual Studio generated files -*.ib_pdb_index -*.idb -*.ilk -*.pdb -*.sln -*.suo -*.vcproj -*vcproj.*.*.user -*.ncb -*.sdf -*.opensdf -*.vcxproj -*vcxproj.* - -# MinGW generated files -*.Debug -*.Release - -# Python byte code -*.pyc - -# Binaries -# -------- -*.dll -*.exe coverage-html client/nymea-remoteproxy-client diff --git a/tests/testbase/testbase.pri b/tests/testbase/testbase.pri index a4572b7..723b56d 100644 --- a/tests/testbase/testbase.pri +++ b/tests/testbase/testbase.pri @@ -3,6 +3,9 @@ RESOURCES += ../resources/resources.qrc CONFIG += testcase QT += testlib +QMAKE_LFLAGS_RPATH= +QMAKE_LFLAGS += "-Wl,-rpath,\'$${top_srcdir}/libnymea-remoteproxy\':'$${top_srcdir}/libnymea-remoteproxyclient\'" + INCLUDEPATH += $${PWD} $$top_srcdir/libnymea-remoteproxy $$top_srcdir/libnymea-remoteproxyclient LIBS += -L$$top_builddir/libnymea-remoteproxy/ -lnymea-remoteproxy \ -L$$top_builddir/libnymea-remoteproxyclient/ -lnymea-remoteproxyclient \