diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-04 10:32:49 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-04 06:01:38 +0200 |
| commit | 9d2ff58f3642828e494e7e9b2df7dbb8e2cd408f (patch) | |
| tree | b2d385cd55c0dbfb6d7e1644907e71474ad76d3b /tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp | |
| parent | fe90725ced04351a11f54caff8636e4665fed396 (diff) | |
Avoid using QSKIP in lieu of compile-time checks
QSKIP is intended to be used to skip test functions that are found at
run-time to be inapplicable or unsafe. If a test function can be
determined to be inapplicable at compile-time, the entire test function
should be omitted instead of replacing the body of the test function
with a QSKIP, which only serves to slow down test runs and to inflate
test run-rates with empty, inapplicable tests.
Task-number: QTQAINFRA-278
Change-Id: I21664d8d92b27c26c64789fc08d0ec7b8988456a
Reviewed-on: http://codereview.qt-project.org/5941
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp')
| -rw-r--r-- | tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index fca2127fec..131fc71ff5 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -92,8 +92,10 @@ private slots: void threadedConnection_data(); void threadedConnection(); +#ifndef QT_NO_PROCESS void processConnection_data(); void processConnection(); +#endif void longPath(); void waitForDisconnect(); @@ -739,6 +741,7 @@ void tst_QLocalSocket::threadedConnection() } } +#ifndef QT_NO_PROCESS void tst_QLocalSocket::processConnection_data() { QTest::addColumn<int>("processes"); @@ -755,9 +758,6 @@ void tst_QLocalSocket::processConnection_data() */ void tst_QLocalSocket::processConnection() { -#if defined(QT_NO_PROCESS) - QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll); -#else QFETCH(int, processes); QStringList serverArguments = QStringList() << SRCDIR "lackey/scripts/server.js" << QString::number(processes); QProcess producer; @@ -789,8 +789,8 @@ void tst_QLocalSocket::processConnection() delete consumer; } producer.waitForFinished(15000); -#endif } +#endif void tst_QLocalSocket::longPath() { |