From bc69fd1dfe30876909091d93a07640a498a24c0c Mon Sep 17 00:00:00 2001 From: Marko Kangas Date: Fri, 13 Feb 2015 13:01:57 +0200 Subject: Skip instead of entirely excluding tests with disabled features Properly QSKIP tests that use disabled QProcess and symlink features instead of excluding them silently by #ifdef. Other reason is that moc doesn't respect QT_NO_* defines in class definition which causes build issues on some platforms. Change-Id: I041020f7452f7d36c7ec8a5866a4ba5eb23d1f94 Reviewed-by: Oswald Buddenhagen Reviewed-by: Jason McDonald --- tests/auto/corelib/plugin/quuid/tst_quuid.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/corelib/plugin') diff --git a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp index 2c70911274..8f37b265f6 100644 --- a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp +++ b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp @@ -66,9 +66,7 @@ private slots: void versions(); void threadUniqueness(); -#ifndef QT_NO_PROCESS void processUniqueness(); -#endif void hash(); @@ -325,9 +323,11 @@ void tst_QUuid::threadUniqueness() qDeleteAll(threads); } -#ifndef QT_NO_PROCESS void tst_QUuid::processUniqueness() { +#ifdef QT_NO_PROCESS + QSKIP("No qprocess support", SkipAll); +#else QProcess process; QString processOneOutput; QString processTwoOutput; @@ -352,8 +352,8 @@ void tst_QUuid::processUniqueness() // They should be *different*! QVERIFY(processOneOutput != processTwoOutput); -} #endif +} void tst_QUuid::hash() { -- cgit v1.2.3