summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/codecs
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-04 11:51:31 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-05 03:04:31 +0200
commit7cfad460c56319ba89c4a3a0bbcb2e54ab1cdbc6 (patch)
tree5df8fca668dace17eea7b6c5ed82db8e87180105 /tests/auto/corelib/codecs
parentc46f59fadf63b661d8611e5896f09fb85c17a00c (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: Ib2025339422749cf216e87ac414a3056250bf8f9 Reviewed-on: http://codereview.qt-project.org/5942 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib/codecs')
-rw-r--r--tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
index d1e6a95d8c..095103dd8a 100644
--- a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
@@ -91,7 +91,7 @@ private slots:
void codecForUtfText_data();
void codecForUtfText();
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(QT_NO_PROCESS)
void toLocal8Bit();
#endif
@@ -1934,12 +1934,9 @@ void tst_QTextCodec::codecForUtfText()
QVERIFY(codec == 0);
}
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(QT_NO_PROCESS)
void tst_QTextCodec::toLocal8Bit()
{
-#ifdef QT_NO_PROCESS
- QSKIP("This test requires QProcess", SkipAll);
-#else
QProcess process;
process.start("echo/echo");
QString string(QChar(0x410));
@@ -1949,7 +1946,6 @@ void tst_QTextCodec::toLocal8Bit()
process.waitForFinished();
QCOMPARE(process.exitStatus(), QProcess::NormalExit);
QCOMPARE(process.exitCode(), 0);
-#endif
}
#endif