diff options
| -rw-r--r-- | tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt index 47ac72352c..1c8116aa43 100644 --- a/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt @@ -16,11 +16,17 @@ file(GLOB_RECURSE test_data RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} data/* XML-Test-Suite/*) +file(GLOB_RECURSE tokenError + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + tokenError/* XML-token-error/*) + qt_internal_add_test(tst_qxmlstream SOURCES tst_qxmlstream.cpp LIBRARIES Qt::Network Qt::CorePrivate - TESTDATA ${test_data} + TESTDATA + ${test_data} + ${tokenError} ) diff --git a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp index 75edda97e0..75fa7c66c1 100644 --- a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp +++ b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp @@ -1892,9 +1892,10 @@ void tst_QXmlStream::tokenErrorHandling() const const QDir dir(QFINDTESTDATA("tokenError")); QFile file(dir.absoluteFilePath(fileName)); - // Cross-compiling: File will be on host only + // Cross-compiling: Files may not be found when running test standalone + // QSKIP in that case, because the tested functionality is platform independent. if (!file.exists()) - QSKIP("Testfile not found."); + QSKIP(QObject::tr("Testfile %1 not found.").arg(fileName).toUtf8().constData()); file.open(QIODevice::ReadOnly); QXmlStreamReader reader(&file); |