Merge branch 'run-tests' into 'master'

[qtcontacts-sqlite] Run tests with "make check" See merge request !9
sailfishos · Dec 14, 2017 · 183842b · 183842b
2 parents 3f3577e + 88b2aeb
commit 183842b
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/src/engine/engine.pro b/src/engine/engine.pro
@@ -7,6 +7,7 @@ QT += sql dbus
 
 CONFIG += plugin hide_symbols
 PLUGIN_TYPE=contacts
+DESTDIR=$${PLUGIN_TYPE}
 
 # we hardcode this for Qt4 as there's no GenericDataLocation offered by QDesktopServices
 DEFINES += 'QTCONTACTS_SQLITE_PRIVILEGED_DIR=\'\"privileged\"\''

diff --git a/tests/auto/database/database.pro b/tests/auto/database/database.pro
@@ -1,7 +1,7 @@
-include(../../common.pri)
-
 TARGET = tst_database
 
+include(../../common.pri)
+
 QT += sql
 
 # copied from src/engine/engine.pro, modified for test db

diff --git a/tests/auto/memorytable/memorytable.pro b/tests/auto/memorytable/memorytable.pro
@@ -1,7 +1,7 @@
-include(../../common.pri)
-
 TARGET = tst_memorytable
 
+include(../../common.pri)
+
 HEADERS += \
     ../../util.h
 SOURCES += \

diff --git a/tests/auto/phonenumber/phonenumber.pro b/tests/auto/phonenumber/phonenumber.pro
@@ -1,7 +1,7 @@
-include(../../common.pri)
-
 TARGET = tst_phonenumber
 
+include(../../common.pri)
+
 HEADERS += \
     ../../util.h
 SOURCES += \

diff --git a/tests/auto/qcontactmanager/qcontactmanager.pro b/tests/auto/qcontactmanager/qcontactmanager.pro
@@ -1,7 +1,7 @@
-include(../../common.pri)
-
 TARGET = tst_qcontactmanager
 
+include(../../common.pri)
+
 INCLUDEPATH += \
     ../../../src/engine/
 

diff --git a/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro b/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro
@@ -1,7 +1,7 @@
-include(../../common.pri)
-
 TARGET = tst_qcontactmanagerfiltering
 
+include(../../common.pri)
+
 INCLUDEPATH += \
     ../../../src/engine/
 

diff --git a/tests/common.pri b/tests/common.pri
@@ -8,3 +8,7 @@ INCLUDEPATH += $$PWD/../src/extensions
 
 target.path = /opt/tests/qtcontacts-sqlite-qt5
 INSTALLS += target
+
+check.commands = "LC_ALL=C QT_PLUGIN_PATH=$$shadowed($${PWD})/../src/engine/ ./$${TARGET}"
+check.depends = $${TARGET}
+QMAKE_EXTRA_TARGETS += check