diff options
| author | Steven Ceuppens <steven.ceuppens@icloud.com> | 2013-09-30 10:43:18 +0200 |
|---|---|---|
| committer | Steven Ceuppens <steven.ceuppens@icloud.com> | 2013-10-01 10:46:59 +0200 |
| commit | f3dc27dbcc333cd287b707a91e8204d45e6a5ae0 (patch) | |
| tree | 6afddbc6a3ed14edaf925f2d890e47903aaf71dd /tests | |
| parent | c44a79ddc03ae77a971cd195733f7527812558bc (diff) | |
| download | qtwebsockets-f3dc27dbcc333cd287b707a91e8204d45e6a5ae0.tar.gz | |
Update unit tests
Private unittests get now build with:
$qmake -config private_tests
Change-Id: I5fb234e9c6f86cf2d740a604923eb8a501699d44
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 4 | ||||
| -rw-r--r-- | tests/auto/dataprocessor/dataprocessor.pro | 1 | ||||
| -rw-r--r-- | tests/auto/dataprocessor/tst_dataprocessor.cpp | 2 | ||||
| -rw-r--r-- | tests/tests.pro | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index ad6937d..d8239a2 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs SUBDIRS += \ - dataprocessor - +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + dataprocessor diff --git a/tests/auto/dataprocessor/dataprocessor.pro b/tests/auto/dataprocessor/dataprocessor.pro index 1e55129..7db9f47 100644 --- a/tests/auto/dataprocessor/dataprocessor.pro +++ b/tests/auto/dataprocessor/dataprocessor.pro @@ -11,4 +11,5 @@ QT = core testlib websockets websockets-private SOURCES += tst_dataprocessor.cpp +requires(contains(QT_CONFIG, private_tests)) DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/dataprocessor/tst_dataprocessor.cpp b/tests/auto/dataprocessor/tst_dataprocessor.cpp index 60ec456..656f46a 100644 --- a/tests/auto/dataprocessor/tst_dataprocessor.cpp +++ b/tests/auto/dataprocessor/tst_dataprocessor.cpp @@ -46,6 +46,8 @@ const quint8 RSV2 = 0x30; const quint8 RSV3 = 0x10; const quint8 MASK = 0x80; +QT_USE_NAMESPACE + class tst_DataProcessor : public QObject { Q_OBJECT diff --git a/tests/tests.pro b/tests/tests.pro index 1a9ad66..8f8198e 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,2 +1,5 @@ TEMPLATE = subdirs + +CONFIG += no_docs_target + SUBDIRS += auto autobahn |