diff options
author | Marko Kangas <marko.kangas@theqtcompany.com> | 2015-02-13 13:01:57 +0200 |
---|---|---|
committer | Marko Kangas <marko.kangas@theqtcompany.com> | 2015-03-16 09:34:15 +0000 |
commit | bc69fd1dfe30876909091d93a07640a498a24c0c (patch) | |
tree | 6af7b94832fcd5c596e54338266d43772ca152e6 /tests/auto/network/bearer | |
parent | f1b3244ac16cd5b306450c53fcbd4ee673bfe53b (diff) |
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 <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
Diffstat (limited to 'tests/auto/network/bearer')
-rw-r--r-- | tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp index 4fee41ca8b..2fd80b3e71 100644 --- a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp +++ b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp @@ -67,9 +67,7 @@ private slots: void sessionClosing_data(); void sessionClosing(); -#ifndef QT_NO_PROCESS void outOfProcessSession(); -#endif void invalidSession(); void repeatedOpenClose_data(); @@ -899,9 +897,11 @@ QDebug operator<<(QDebug debug, const QList<QNetworkConfiguration> &list) // Note: outOfProcessSession requires that at least one configuration is // at Discovered -state. -#ifndef QT_NO_PROCESS void tst_QNetworkSession::outOfProcessSession() { +#ifdef QT_NO_PROCESS + QSKIP("No qprocess support", SkipAll); +#else updateConfigurations(); QTest::qWait(2000); @@ -996,8 +996,8 @@ void tst_QNetworkSession::outOfProcessSession() default: QSKIP("Lackey failed"); } -} #endif +} // A convenience / helper function for testcases. Return the first matching configuration. // Ignores configurations in other than 'discovered' -state. Returns invalid (QNetworkConfiguration()) |