summaryrefslogtreecommitdiffstats
path: root/tests/modules
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-08-20 15:25:22 +0200
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-11-02 12:28:15 +0000
commit681ff5542ca4d2405d19ddd9809b0a8cf2d697e8 (patch)
tree9b8359f55fb749a3e9575501a612cf12b9ca78e8 /tests/modules
parent7b2433fd6fefe7642268da3aa270bbc86e81a7b8 (diff)
QTestLib integrationHEADmaster
In order to work with the new CI system, we need to link with testlib. Change-Id: I285d651c2e1189a79153a6d942c10522305f2f3c Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'tests/modules')
-rw-r--r--tests/modules/Application/Application.pro2
-rw-r--r--tests/modules/ApplicationManager/ApplicationManager.pro2
-rw-r--r--tests/modules/DesktopFileReader/DesktopFileReader.pro2
-rw-r--r--tests/modules/General/General.pro2
-rw-r--r--tests/modules/MirSurfaceItem/MirSurfaceItem.pro2
-rw-r--r--tests/modules/SessionManager/SessionManager.pro2
-rw-r--r--tests/modules/SharedWakelock/SharedWakelock.pro6
-rw-r--r--tests/modules/TaskController/TaskController.pro2
-rw-r--r--tests/modules/common/common.pri2
9 files changed, 13 insertions, 9 deletions
diff --git a/tests/modules/Application/Application.pro b/tests/modules/Application/Application.pro
index e8290b5..7aa1999 100644
--- a/tests/modules/Application/Application.pro
+++ b/tests/modules/Application/Application.pro
@@ -1,4 +1,4 @@
-TARGET = application_test
+TESTNAME = application
include (../../testcommon.pri)
diff --git a/tests/modules/ApplicationManager/ApplicationManager.pro b/tests/modules/ApplicationManager/ApplicationManager.pro
index 686b96d..86e287e 100644
--- a/tests/modules/ApplicationManager/ApplicationManager.pro
+++ b/tests/modules/ApplicationManager/ApplicationManager.pro
@@ -1,4 +1,4 @@
-TARGET = application_manager_test
+TESTNAME = application_manager
include (../../testcommon.pri)
diff --git a/tests/modules/DesktopFileReader/DesktopFileReader.pro b/tests/modules/DesktopFileReader/DesktopFileReader.pro
index 3bc4093..bc876ae 100644
--- a/tests/modules/DesktopFileReader/DesktopFileReader.pro
+++ b/tests/modules/DesktopFileReader/DesktopFileReader.pro
@@ -1,4 +1,4 @@
-TARGET = desktopfilereader_test
+TESTNAME = desktopfilereader
include (../../testcommon.pri)
diff --git a/tests/modules/General/General.pro b/tests/modules/General/General.pro
index 851b7b6..a458cf4 100644
--- a/tests/modules/General/General.pro
+++ b/tests/modules/General/General.pro
@@ -1,4 +1,4 @@
-TARGET = objectlistmodel_test
+TESTNAME = objectlistmodel
include (../../testcommon.pri)
diff --git a/tests/modules/MirSurfaceItem/MirSurfaceItem.pro b/tests/modules/MirSurfaceItem/MirSurfaceItem.pro
index 9cd5f86..6c94c1b 100644
--- a/tests/modules/MirSurfaceItem/MirSurfaceItem.pro
+++ b/tests/modules/MirSurfaceItem/MirSurfaceItem.pro
@@ -1,4 +1,4 @@
-TARGET = mirsurfaceitem_test
+TESTNAME = mirsurfaceitem
include (../../testcommon.pri)
diff --git a/tests/modules/SessionManager/SessionManager.pro b/tests/modules/SessionManager/SessionManager.pro
index 4ae2910..6f7a475 100644
--- a/tests/modules/SessionManager/SessionManager.pro
+++ b/tests/modules/SessionManager/SessionManager.pro
@@ -1,4 +1,4 @@
-TARGET = session_manager_test
+TESTNAME = session_manager
include (../../testcommon.pri)
diff --git a/tests/modules/SharedWakelock/SharedWakelock.pro b/tests/modules/SharedWakelock/SharedWakelock.pro
index 85f422a..4cc96c2 100644
--- a/tests/modules/SharedWakelock/SharedWakelock.pro
+++ b/tests/modules/SharedWakelock/SharedWakelock.pro
@@ -1,4 +1,4 @@
-TARGET = sharedwakelock_test
+TESTNAME = sharedwakelock
CONFIG += gtest_own_main
@@ -14,5 +14,9 @@ QT += testlib dbus
PKGCONFIG += libqtdbusmock-1 libqtdbustest-1
+# It is also possible to use hardcoded paths for testing:
+# LIBS += -lqtdbustest -lqtdbusmock
+# INCLUDEPATH += /usr/include/libqtdbustest-1
+# INCLUDEPATH += /usr/include/libqtdbusmock-1
SOURCES += sharedwakelock_test.cpp
diff --git a/tests/modules/TaskController/TaskController.pro b/tests/modules/TaskController/TaskController.pro
index fbd6da8..50d41ad 100644
--- a/tests/modules/TaskController/TaskController.pro
+++ b/tests/modules/TaskController/TaskController.pro
@@ -1,4 +1,4 @@
-TARGET = taskcontroller_test
+TESTNAME = taskcontroller
include (../../testcommon.pri)
diff --git a/tests/modules/common/common.pri b/tests/modules/common/common.pri
index 2b6fc67..845d436 100644
--- a/tests/modules/common/common.pri
+++ b/tests/modules/common/common.pri
@@ -6,4 +6,4 @@ HEADERS += \
INCLUDEPATH += $$PWD
-QT += quick dbus testlib
+QT += quick dbus