From d9f37afe2ef52a59280bdf30b01c958e48372b99 Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Tue, 20 Nov 2018 20:24:19 +0300
Subject: [PATCH] Build and run tests with qmake

as of now, running tests is as simple as just typing
  qmake && make check
---
 tests/mixed/mixed.pro     | 21 +++------------------
 tests/pack/pack-test.pro  | 22 ----------------------
 tests/pack/pack.pro       |  7 +++++++
 tests/qttypes/qttypes.pro |  7 +++++++
 tests/stream/stream.pro   | 34 ++++------------------------------
 tests/tests.pro           |  6 +++++-
 tests/unpack/unpack.pro   | 20 +++-----------------
 7 files changed, 29 insertions(+), 88 deletions(-)
 delete mode 100644 tests/pack/pack-test.pro
 create mode 100644 tests/pack/pack.pro
 create mode 100644 tests/qttypes/qttypes.pro

diff --git a/tests/mixed/mixed.pro b/tests/mixed/mixed.pro
index ba6ee3f..ecdc189 100644
--- a/tests/mixed/mixed.pro
+++ b/tests/mixed/mixed.pro
@@ -1,22 +1,7 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2014-09-26T19:10:31
-#
-#-------------------------------------------------
-
-QT       += testlib
-
-QT       -= gui
-
 TARGET = mixed_test
-CONFIG   += console
-CONFIG   -= app_bundle
-
-TEMPLATE = app
-
-INCLUDEPATH += ../../src
-LIBS += -lqmsgpack
+QT += testlib
+CONFIG += testcase
 
+include(../tests.pri)
 
 SOURCES += mixed_test.cpp
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/pack/pack-test.pro b/tests/pack/pack-test.pro
deleted file mode 100644
index 8aa092e..0000000
--- a/tests/pack/pack-test.pro
+++ /dev/null
@@ -1,22 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2014-09-20T15:17:37
-#
-#-------------------------------------------------
-
-QT       += testlib
-
-QT       -= gui
-
-TARGET = pack_test
-CONFIG   += console
-CONFIG   -= app_bundle
-
-TEMPLATE = app
-
-LIBS += -lqmsgpack
-INCLUDEPATH += ../../src
-
-
-SOURCES += pack_test.cpp
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/pack/pack.pro b/tests/pack/pack.pro
new file mode 100644
index 0000000..29a8692
--- /dev/null
+++ b/tests/pack/pack.pro
@@ -0,0 +1,7 @@
+TARGET = pack_test
+QT += testlib
+CONFIG += testcase
+
+include(../tests.pri)
+
+SOURCES += pack_test.cpp
diff --git a/tests/qttypes/qttypes.pro b/tests/qttypes/qttypes.pro
new file mode 100644
index 0000000..fd29df2
--- /dev/null
+++ b/tests/qttypes/qttypes.pro
@@ -0,0 +1,7 @@
+TARGET = qttypes_test
+QT += testlib
+CONFIG += testcase
+
+include(../tests.pri)
+
+SOURCES += qttypes_test.cpp
diff --git a/tests/stream/stream.pro b/tests/stream/stream.pro
index cdf1737..87b57ee 100644
--- a/tests/stream/stream.pro
+++ b/tests/stream/stream.pro
@@ -1,33 +1,7 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2017-07-10T14:58:18
-#
-#-------------------------------------------------
-
-QT       += testlib
-
-QT       -= gui
-
-TARGET = tst_streamtest
-CONFIG   += console
-CONFIG   -= app_bundle
-
-TEMPLATE = app
+TARGET = stream_test
+QT += testlib
+CONFIG += testcase
 
 include(../tests.pri)
 
-# The following define makes your compiler emit warnings if you use
-# any feature of Qt which as been marked as deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if you use deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-
-SOURCES += \
-    stream_test.cpp
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
+SOURCES += stream_test.cpp
diff --git a/tests/tests.pro b/tests/tests.pro
index 8fc7f92..397bda5 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,4 +1,8 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    stream
+    pack \
+    unpack \
+    mixed \
+    stream \
+    qttypes
diff --git a/tests/unpack/unpack.pro b/tests/unpack/unpack.pro
index e25c366..4040d36 100644
--- a/tests/unpack/unpack.pro
+++ b/tests/unpack/unpack.pro
@@ -1,21 +1,7 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2014-09-25T10:25:22
-#
-#-------------------------------------------------
-
-QT       += testlib
-
-QT       -= gui
-
 TARGET = unpack_test
-CONFIG   += console
-CONFIG   -= app_bundle
-
-TEMPLATE = app
-include($$PWD/../../qmsgpack.pri)
-INCLUDEPATH += ../../src
+QT += testlib
+CONFIG += testcase
 
+include(../tests.pri)
 
 SOURCES += unpack_test.cpp
-DEFINES += SRCDIR=\\\"$$PWD/\\\"