From ceb5474d5f71e223373cc957af4a073886e326bd Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Tue, 16 Oct 2012 12:07:21 +0200 Subject: Test: remove QSKIP in tst_QDBusMarshall::receiveUnknownType Omit the whole test and relative types if DBUS_TYPE_UNIX_FD is not defined since the test is not relevant in that case (D-Bus library too old). Change-Id: I167622f485c0f34d64984c4fa96be974e54f56bc Reviewed-by: J-P Nurmi --- tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/auto/dbus/qdbusmarshall') diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp index cdee3a7505..6274e0e0fa 100644 --- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp +++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp @@ -90,8 +90,10 @@ private slots: void sendCallErrors_data(); void sendCallErrors(); +#ifdef DBUS_TYPE_UNIX_FD void receiveUnknownType_data(); void receiveUnknownType(); +#endif void demarshallPrimitives_data(); void demarshallPrimitives(); @@ -1028,6 +1030,8 @@ void tst_QDBusMarshall::sendCallErrors() QCOMPARE(reply.errorMessage(), errorMsg); } +#ifdef DBUS_TYPE_UNIX_FD +// If DBUS_TYPE_UNIX_FD is not defined, it means the current system's D-Bus library is too old for this test void tst_QDBusMarshall::receiveUnknownType_data() { QTest::addColumn("receivedTypeId"); @@ -1078,9 +1082,6 @@ public: void tst_QDBusMarshall::receiveUnknownType() { -#ifndef DBUS_TYPE_UNIX_FD - QSKIP("Your system's D-Bus library is too old for this test"); -#else QDBusConnection con = QDBusConnection::sessionBus(); QVERIFY(con.isConnected()); @@ -1184,8 +1185,8 @@ void tst_QDBusMarshall::receiveUnknownType() //qDebug() << spy.list.at(0).arguments().at(0).typeName(); QCOMPARE(spy.list.at(0).arguments().at(0).userType(), receivedTypeId); } -#endif } +#endif void tst_QDBusMarshall::demarshallPrimitives_data() { -- cgit v1.2.3