diff options
| -rw-r--r-- | tests/auto/qmltest/tst_qmltest.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/tests/auto/qmltest/tst_qmltest.cpp b/tests/auto/qmltest/tst_qmltest.cpp index 26d56de6..d71ad912 100644 --- a/tests/auto/qmltest/tst_qmltest.cpp +++ b/tests/auto/qmltest/tst_qmltest.cpp @@ -28,21 +28,33 @@ ****************************************************************************/ #include <QtQuickTest/quicktest.h> + +class tst_skiptest: public QObject +{ + Q_OBJECT +private slots: + void skiptest() { QSKIP("This test will fail, skipping."); }; +}; + int main(int argc, char **argv) { if (!qEnvironmentVariableIsEmpty("QEMU_LD_PREFIX")) { - qWarning("This test will fail due to QEMU emulation shortcomings."); - return 0; + qWarning("This test would fail due to QEMU emulation shortcomings, so it will be skipped."); + tst_skiptest skip; + return QTest::qExec(&skip); } #ifdef Q_OS_QNX if (qEnvironmentVariable("QTEST_ENVIRONMENT").split(' ').contains("ci") && qEnvironmentVariable("QT_QPA_PLATFORM").split(' ').contains("offscreen") ) { - qWarning("This test will fail on CI QNX QEMU without OpenGL support."); - return 0; + qWarning("This test would fail on CI QNX QEMU without OpenGL support, so it will be skipped."); + tst_skiptest skip; + return QTest::qExec(&skip); } #endif qputenv("QSG_RHI_BACKEND", "opengl"); QTEST_SET_MAIN_SOURCE_PATH return quick_test_main(argc, argv, "qmltest", QUICK_TEST_SOURCE_DIR); } + +#include "tst_qmltest.moc" |