From da3e8e761b74ec42a31676a4640adcd05335f4e0 Mon Sep 17 00:00:00 2001 From: Xizhi Zhu Date: Tue, 10 Jan 2012 04:58:58 +0200 Subject: [PATCH] Remove the unused QTRY_COMPARE macro from bearer auto tests. The custom QTRY_VERIFY macro is needed since the one provided by testlib does not support custom timeout. Change-Id: I12bbc5efcb16c4f53514ad738d6115d217a55b05 Reviewed-by: Alex --- tests/auto/network/bearer/qbearertestcommon.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tests/auto/network/bearer/qbearertestcommon.h b/tests/auto/network/bearer/qbearertestcommon.h index 7a7a6edf5d..4b73b51d15 100644 --- a/tests/auto/network/bearer/qbearertestcommon.h +++ b/tests/auto/network/bearer/qbearertestcommon.h @@ -69,19 +69,4 @@ QVERIFY(__expr); \ } while(0) -// Will try to wait for the condition while allowing event processing -#define QTRY_COMPARE(__expr, __expected) \ - do { \ - const int __step = 50; \ - const int __timeout = 90000; \ - if ((__expr) != (__expected)) { \ - QTest::qWait(0); \ - } \ - for (int __i = 0; __i < __timeout && ((__expr) != (__expected)); __i+=__step) { \ - QTest::qWait(__step); \ - } \ - QCOMPARE(__expr, __expected); \ - } while(0) - #endif -