summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-26 10:52:54 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-27 03:14:59 +0200
commit66c3f8753c0557fdfafc79cdab11fbd6ffde9105 (patch)
tree22d854c52cf9587ef859d7c9aadf34b9da416038 /tests/auto/corelib
parenta97c0c3c996beaa2e657645e912e63b1502d8026 (diff)
Remove inappropriate QSKIP in QTextCodec autotest.
There were only two ways the QSKIP could be called: (1) the C++ runtime is broken, or (2) the earlier call to resize the string failed. In both cases there should be a hard test failure. In the former case, a broken C++ runtime calls all of the test results into question. In the latter case, the QByteArray::resize() method has suffered a regression. Change-Id: I5adf942d2eb4d746d2ab31e98571c5d9bdd40890 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r--tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
index c3002a81bc..4c9fc49e65 100644
--- a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
@@ -340,8 +340,7 @@ void tst_QTextCodec::codecForLocale()
originalLocaleEncodedTimeString.size(),
"%A%a%B%b%Z",
localtime(&t));
- if (r == 0)
- QSKIP("strftime() failed");
+ QVERIFY(r != 0);
originalLocaleEncodedTimeString.resize(r);
QString unicodeTimeString = codec->toUnicode(originalLocaleEncodedTimeString);