diff options
| author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-12-02 15:50:38 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2014-12-03 07:12:34 +0100 |
| commit | 828603893f24db24975a327ad8141cb66826b0b0 (patch) | |
| tree | fbd83d15059e307dacbcc59d039df6d4478cdd35 /tests | |
| parent | 78d90f1ec64fc7d588346c26d4270dc58c395e54 (diff) | |
Bluetooth auto test - OS X and iOS
Since now we run OS X on virtual machines without BT adapters,
tests will fail unless specially adjusted. Disable them for the moment.
Change-Id: I23e1c8be30354f4c1c481d1e3c6fb38ce4804630
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'tests')
6 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro b/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro index a7868123..01ad617b 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro +++ b/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro @@ -4,5 +4,5 @@ CONFIG += testcase QT = core concurrent bluetooth testlib osx:QT += widgets - +osx:CONFIG += insignificant_test DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro b/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro index 7322cd70..f0d658ff 100644 --- a/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro +++ b/tests/auto/qbluetoothlocaldevice/qbluetoothlocaldevice.pro @@ -4,5 +4,5 @@ CONFIG += testcase QT = core concurrent bluetooth testlib osx:QT += widgets - +osx:CONFIG += insignificant_test DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qbluetoothserver/qbluetoothserver.pro b/tests/auto/qbluetoothserver/qbluetoothserver.pro index ad0d1fab..870a28d7 100644 --- a/tests/auto/qbluetoothserver/qbluetoothserver.pro +++ b/tests/auto/qbluetoothserver/qbluetoothserver.pro @@ -4,6 +4,7 @@ CONFIG += testcase QT = core concurrent bluetooth testlib osx:QT += widgets +osx:CONFIG += insignificant_test OTHER_FILES += \ README.txt diff --git a/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro b/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro index 8d3d3669..2cc4a9e8 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro +++ b/tests/auto/qbluetoothservicediscoveryagent/qbluetoothservicediscoveryagent.pro @@ -4,7 +4,7 @@ CONFIG += testcase QT = core concurrent bluetooth testlib osx:QT += widgets - +osx:CONFIG += insignificant_test blackberry { LIBS += -lbtapi } diff --git a/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro b/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro index e55bac3a..a1bfc58e 100644 --- a/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro +++ b/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro @@ -4,6 +4,7 @@ CONFIG += testcase QT = core concurrent bluetooth testlib osx:QT += widgets +osx:CONFIG += insignificant_test DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro index 3c0f9e44..cd0dc861 100644 --- a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro +++ b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro @@ -5,6 +5,7 @@ testcase.timeout = 250 # this test is slow QT = core concurrent network bluetooth testlib osx:QT += widgets +osx:CONFIG += insignificant_test OTHER_FILES += \ README.txt |