diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-02-09 11:31:01 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-09 12:52:28 +0100 |
| commit | 581f079b04d4c1901d820304b3e9195e096e34e2 (patch) | |
| tree | 229cee680820f50adad45e02bd2f8eb05e636b21 /tests/auto/corelib/tools/qbytearray | |
| parent | 7aca5aa910f610239c7d33696003d100e558d45a (diff) | |
Make "nmake check" pass for corelib tests in Windows.
- Marked four tests insignificant due to failures, these need to be
fixed later and then re-enabled:
- tst_qfilesystemwatcher
- tst_qsettings
- tst_qlibrary
- tst_qsharedpointer
- Skipped one invalid case (tst_QCoreApplication::argc())
- Ifdeffed around vsprintf issue in MSVC (tst_QByteArray::qvsnprintf())
Task-number: QTBUG-24157
Task-number: QTBUG-24146
Task-number: QTBUG-24128
Change-Id: I4db957a65fbf0093f5ae3dc1a04d792492818104
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Diffstat (limited to 'tests/auto/corelib/tools/qbytearray')
| -rw-r--r-- | tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp index c1598c452d..40e4cc398f 100644 --- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp @@ -521,7 +521,10 @@ void tst_QByteArray::qvsnprintf() QCOMPARE(::qsnprintf(buf, 10, "%s", "bubu"), 4); QCOMPARE(static_cast<const char *>(buf), "bubu"); +#ifndef Q_CC_MSVC + // MSVC implementation of vsnprintf overwrites bytes after null terminator so this would fail. QCOMPARE(buf[5], char(42)); +#endif qMemSet(buf, 42, sizeof(buf)); QCOMPARE(::qsnprintf(buf, 5, "%s", "bubu"), 4); |