diff options
18 files changed, 70 insertions, 41 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 2843cf58..1f1b12cb 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,38 +1,47 @@ TEMPLATE = subdirs -# Required by tst_maketestselftest::tests_pro_files -# Mark the following non unit test directories ok -# nfcdata +SUBDIRS += \ + qbluetoothaddress \ + qbluetoothdevicediscoveryagent \ + qbluetoothdeviceinfo \ + qbluetoothlocaldevice \ + qbluetoothservicediscoveryagent \ + qbluetoothserviceinfo \ + qbluetoothsocket \ + qbluetoothtransfermanager \ + qbluetoothtransferrequest \ + qbluetoothuuid \ + ql2capserver \ + qndefmessage \ + qndefrecord \ + qnearfieldmanager \ + qnearfieldtagtype1 \ + qnearfieldtagtype2 \ + qrfcommserver \ -#SUBDIRS += \ -# qndefrecord \ -# qndefmessage \ -# qnearfieldtagtype1 \ -# qnearfieldtagtype2 \ -# qnearfieldmanager +!contains(QT_CONFIG, bluetooth): SUBDIRS -= \ + qbluetoothaddress \ + qbluetoothdevicediscoveryagent \ + qbluetoothdeviceinfo \ + qbluetoothlocaldevice \ + qbluetoothservicediscoveryagent \ + qbluetoothserviceinfo \ + qbluetoothsocket \ + qbluetoothtransfermanager \ + qbluetoothtransferrequest \ + qbluetoothuuid \ + ql2capserver \ -#!win32:SUBDIRS += \ -# qbluetoothaddress\ -# qbluetoothuuid\ -# qbluetoothdeviceinfo\ -# qbluetoothdevicediscoveryagent\ -# qbluetoothserviceinfo\ -# qbluetoothservicediscoveryagent\ -# qbluetoothsocket\ -# qrfcommserver \ -# qbluetoothtransferrequest +!contains(QT_CONFIG, nfc): SUBDIRS -= \ + qndefmessage \ + qndefrecord \ + qnearfieldmanager \ + qnearfieldtagtype1 \ + qnearfieldtagtype2 \ + +# QTBUG-22015 these do not compile. +SUBDIRS -= \ + qnearfieldmanager \ + qnearfieldtagtype1 \ + qnearfieldtagtype2 \ -#enable autotests on symbian -symbian:SUBDIRS += \ - qbluetoothaddress\ - qbluetoothuuid\ - qbluetoothdeviceinfo\ - qbluetoothdevicediscoveryagent\ - qbluetoothserviceinfo\ - qbluetoothservicediscoveryagent\ - qbluetoothsocket\ - qrfcommserver \ - qbluetoothtransferrequest \ - qbluetoothlocaldevice \ - qbluetoothtransfermanager \ - ql2capserver diff --git a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro b/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro index 7802f970..de27afe9 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro +++ b/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro @@ -5,3 +5,5 @@ CONFIG += testcase QT = core bluetooth testlib symbian: TARGET.CAPABILITY = ReadDeviceData LocalServices WriteDeviceData + +CONFIG += insignificant_test # QTBUG-22017 diff --git a/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro b/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro index 7c71ef7e..16879754 100644 --- a/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro +++ b/tests/auto/qbluetoothdeviceinfo/qbluetoothdeviceinfo.pro @@ -5,3 +5,5 @@ CONFIG += testcase QT = core bluetooth testlib symbian: TARGET.CAPABILITY = ReadDeviceData LocalServices WriteDeviceData + +CONFIG += insignificant_test # QTBUG-22017 diff --git a/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro b/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro index b9e8e367..c092a971 100644 --- a/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro +++ b/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro @@ -5,3 +5,5 @@ CONFIG += testcase QT = core bluetooth testlib symbian: TARGET.CAPABILITY = ReadDeviceData LocalServices WriteDeviceData NetworkControl + +CONFIG += insignificant_test # QTBUG-22017 diff --git a/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro b/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro index eee23d89..1c024bb9 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro +++ b/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro @@ -5,3 +5,5 @@ CONFIG += testcase QT = core bluetooth testlib symbian: TARGET.CAPABILITY = ReadDeviceData LocalServices WriteDeviceData + +CONFIG += insignificant_test # QTBUG-22017 diff --git a/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro b/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro index 1b70bafa..ef7b9168 100644 --- a/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro +++ b/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro @@ -5,3 +5,5 @@ CONFIG += testcase QT = core bluetooth testlib symbian: TARGET.CAPABILITY = ReadDeviceData LocalServices WriteDeviceData + +CONFIG += insignificant_test # QTBUG-22017 diff --git a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro index 740efcb3..7b5e0ee6 100644 --- a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro +++ b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro @@ -11,3 +11,5 @@ symbian: TARGET.CAPABILITY = NetworkControl ReadDeviceData LocalServices WriteDe OTHER_FILES += \ README.txt + +CONFIG += insignificant_test # QTBUG-22017 diff --git a/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro b/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro index 37bab8c3..9dcdbb65 100644 --- a/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro +++ b/tests/auto/qbluetoothtransfermanager/qbluetoothtransfermanager.pro @@ -8,3 +8,5 @@ INCLUDEPATH += ../../../tests/btclient DEPENDPATH += ../../../tests/btclient symbian: TARGET.CAPABILITY = All-TCB #ReadDeviceData LocalServices WriteDeviceData + +CONFIG += insignificant_test # QTBUG-22017 diff --git a/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro b/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro index 7b9ec0b0..47c022ac 100644 --- a/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro +++ b/tests/auto/qbluetoothtransferrequest/qbluetoothtransferrequest.pro @@ -5,3 +5,5 @@ CONFIG += testcase QT = core bluetooth testlib symbian: TARGET.CAPABILITY = ReadDeviceData LocalServices WriteDeviceData + +CONFIG += insignificant_test # QTBUG-22017 diff --git a/tests/auto/ql2capserver/ql2capserver.pro b/tests/auto/ql2capserver/ql2capserver.pro index ecd8cef3..d59d3b67 100644 --- a/tests/auto/ql2capserver/ql2capserver.pro +++ b/tests/auto/ql2capserver/ql2capserver.pro @@ -1,6 +1,8 @@ SOURCES += tst_ql2capserver.cpp TARGET = tst_ql2capserver -CONFIG += testcase + +# Note, not really an autotest. Requires manually setting up and running btclient first. +#CONFIG += testcase QT = core bluetooth testlib diff --git a/tests/auto/qndefmessage/qndefmessage.pro b/tests/auto/qndefmessage/qndefmessage.pro index c1309387..dc45d34f 100644 --- a/tests/auto/qndefmessage/qndefmessage.pro +++ b/tests/auto/qndefmessage/qndefmessage.pro @@ -3,3 +3,5 @@ TARGET = tst_qndefmessage CONFIG += testcase QT = core nfc testlib + +CONFIG += insignificant_test # QTBUG-22016 diff --git a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro index 2757d56a..0cf18cbc 100644 --- a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro +++ b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro @@ -2,7 +2,7 @@ SOURCES += tst_qnearfieldmanager.cpp TARGET = tst_qnearfieldmanager CONFIG += testcase -QT = core nfc testlib +QT = core nfc-private testlib DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\" diff --git a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp index 1c156f76..304a5c10 100644 --- a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp +++ b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp @@ -42,8 +42,8 @@ #include <QtTest/QtTest> #include "../qconnectivitytestcommon.h" -#include "qnearfieldmanager_emulator_p.h" +#include <private/qnearfieldmanager_emulator_p.h> #include <qnearfieldmanager.h> #include <qndefnfctextrecord.h> #include <qndefnfcurirecord.h> diff --git a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro index 1494c4c5..11284551 100644 --- a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro +++ b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro @@ -2,7 +2,7 @@ SOURCES += tst_qnearfieldtagtype1.cpp TARGET = tst_qnearfieldtagtype1 CONFIG += testcase -QT = core nfc testlib +QT = core nfc-private testlib DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\" diff --git a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp index 9e27e94b..12f561cc 100644 --- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp +++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp @@ -42,8 +42,8 @@ #include <QtTest/QtTest> #include "../qconnectivitytestcommon.h" -#include "qnearfieldmanager_emulator_p.h" +#include <private/qnearfieldmanager_emulator_p.h> #include <qnearfieldmanager.h> #include <qndefmessage.h> #include <qnearfieldtagtype1.h> diff --git a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro index 3f7db6c1..38aacfd7 100644 --- a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro +++ b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro @@ -2,7 +2,7 @@ SOURCES += tst_qnearfieldtagtype2.cpp TARGET = tst_qnearfieldtagtype2 CONFIG += testcase -QT = core nfc testlib +QT = core nfc-private testlib DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp index bb545559..8ae17d26 100644 --- a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp +++ b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp @@ -42,8 +42,8 @@ #include <QtTest/QtTest> #include "../qconnectivitytestcommon.h" -#include "qnearfieldmanager_emulator_p.h" +#include <private/qnearfieldmanager_emulator_p.h> #include <qnearfieldmanager.h> #include <qndefmessage.h> #include <qnearfieldtagtype2.h> diff --git a/tests/auto/qrfcommserver/qrfcommserver.pro b/tests/auto/qrfcommserver/qrfcommserver.pro index 75459b83..770b4f5e 100644 --- a/tests/auto/qrfcommserver/qrfcommserver.pro +++ b/tests/auto/qrfcommserver/qrfcommserver.pro @@ -9,4 +9,4 @@ symbian: TARGET.CAPABILITY = LocalServices NetworkControl WriteDeviceData OTHER_FILES += \ README.txt - +CONFIG += insignificant_test # QTBUG-22017 |