From 27f9f136f7e39b5d612bc02f7ff8778ab424c07d Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 19 Oct 2011 12:53:13 +1000 Subject: Remove SkipMode parameter from QSKIP calls. The previous commit removed SkipMode from the testlib APi. This commit removes the parameter from all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5 Reviewed-by: Rohan McGovern --- tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp | 2 +- tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/dbus') diff --git a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp index c89fd7dde4..56431b8716 100644 --- a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp +++ b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp @@ -257,7 +257,7 @@ void tst_QDBusLocalCalls::asyncReplySignal() callMsg << "Hello World"; QDBusPendingCall ac = conn.asyncCall(callMsg); if (ac.isFinished()) - QSKIP("Test ignored: the local-loop async call is already finished", SkipAll); + QSKIP("Test ignored: the local-loop async call is already finished"); QDBusPendingCallWatcher watch(ac); connect(&watch, SIGNAL(finished(QDBusPendingCallWatcher*)), diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp index cca212e278..005dfda082 100644 --- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp +++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp @@ -1060,7 +1060,7 @@ public: void tst_QDBusMarshall::receiveUnknownType() { #ifndef DBUS_TYPE_UNIX_FD - QSKIP("Your system's D-Bus library is too old for this test", SkipAll); + QSKIP("Your system's D-Bus library is too old for this test"); #else QDBusConnection con = QDBusConnection::sessionBus(); QVERIFY(con.isConnected()); @@ -1074,7 +1074,7 @@ void tst_QDBusMarshall::receiveUnknownType() // check if this bus supports passing file descriptors if (!dbus_connection_can_send_type(rawcon.data(), DBUS_TYPE_UNIX_FD)) - QSKIP("Your session bus does not allow sending Unix file descriptors", SkipAll); + QSKIP("Your session bus does not allow sending Unix file descriptors"); // make sure this QDBusConnection won't handle Unix file descriptors QDBusConnection::ConnectionCapabilities &capabRef = QDBusConnectionPrivate::d(con)->capabilities; -- cgit v1.2.3