summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Korpipaa <tomi.korpipaa@qt.io>2022-05-11 07:04:18 +0300
committerTomi Korpipaa <tomi.korpipaa@qt.io>2022-05-11 07:05:20 +0300
commit70f170a8d322de0cbafe6f54ce197fde9dd6e79d (patch)
tree0f98e378e102415935df4503aa6c2bc0df373853
parent3c5e2bc94664cff57c11a5229a785803c1b98689 (diff)
Rename the test to match the expected filename
...and pass argv+argc to qExec. Task-number: QTBUG-102735 Change-Id: If2ef09f39d13c29f73b9b199e50b72b0e91ffe75 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 069eb42d7f62364b60b70dce461c46ec01f1ddec) Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--tests/auto/qmltest/tst_qmltest.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qmltest/tst_qmltest.cpp b/tests/auto/qmltest/tst_qmltest.cpp
index d71ad912..cde45b0b 100644
--- a/tests/auto/qmltest/tst_qmltest.cpp
+++ b/tests/auto/qmltest/tst_qmltest.cpp
@@ -29,7 +29,7 @@
#include <QtQuickTest/quicktest.h>
-class tst_skiptest: public QObject
+class tst_qmltest: public QObject
{
Q_OBJECT
private slots:
@@ -40,16 +40,16 @@ int main(int argc, char **argv)
{
if (!qEnvironmentVariableIsEmpty("QEMU_LD_PREFIX")) {
qWarning("This test would fail due to QEMU emulation shortcomings, so it will be skipped.");
- tst_skiptest skip;
- return QTest::qExec(&skip);
+ tst_qmltest skip;
+ return QTest::qExec(&skip, argc, argv);
}
#ifdef Q_OS_QNX
if (qEnvironmentVariable("QTEST_ENVIRONMENT").split(' ').contains("ci") &&
qEnvironmentVariable("QT_QPA_PLATFORM").split(' ').contains("offscreen")
) {
qWarning("This test would fail on CI QNX QEMU without OpenGL support, so it will be skipped.");
- tst_skiptest skip;
- return QTest::qExec(&skip);
+ tst_qmltest skip;
+ return QTest::qExec(&skip, argc, argv);
}
#endif
qputenv("QSG_RHI_BACKEND", "opengl");