diff options
author | Maximilian Goldstein <max.goldstein@qt.io> | 2021-02-03 12:06:33 +0100 |
---|---|---|
committer | Maximilian Goldstein <max.goldstein@qt.io> | 2021-02-03 16:32:49 +0100 |
commit | 5fb34b67b810ca284c216009925f4f38220c4510 (patch) | |
tree | b8d36c4a93f10d42eb0e1f4e755d4d44d14f7772 /tests/auto | |
parent | 79014a1b39a4dca09a9d67de68161b10da4bcdef (diff) |
qmllint: Fix segmentation fault
Pick-to: 6.0
Change-Id: Ie04ad4221b25628687c2575facf90488b83d21bf
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/qml/qmllint/data/SegFault.bad.qml | 6 | ||||
-rw-r--r-- | tests/auto/qml/qmllint/data/SegFault.qml | 6 | ||||
-rw-r--r-- | tests/auto/qml/qmllint/tst_qmllint.cpp | 10 |
3 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/qml/qmllint/data/SegFault.bad.qml b/tests/auto/qml/qmllint/data/SegFault.bad.qml new file mode 100644 index 0000000000..c31777e7c8 --- /dev/null +++ b/tests/auto/qml/qmllint/data/SegFault.bad.qml @@ -0,0 +1,6 @@ +import QtQuick as T +T.Item { + T.Rectangle { + property int length: parent.T.Screen.foobar + } +} diff --git a/tests/auto/qml/qmllint/data/SegFault.qml b/tests/auto/qml/qmllint/data/SegFault.qml new file mode 100644 index 0000000000..c66ad472f1 --- /dev/null +++ b/tests/auto/qml/qmllint/data/SegFault.qml @@ -0,0 +1,6 @@ +import QtQuick as T +T.Item { + T.Rectangle { + property int length: parent.T.Screen.pixelDensity + } +} diff --git a/tests/auto/qml/qmllint/tst_qmllint.cpp b/tests/auto/qml/qmllint/tst_qmllint.cpp index b874d3cc6f..dc84e1c535 100644 --- a/tests/auto/qml/qmllint/tst_qmllint.cpp +++ b/tests/auto/qml/qmllint/tst_qmllint.cpp @@ -277,6 +277,12 @@ void TestQmllint::dirtyQmlCode_data() << QStringLiteral("brokenNamespace.qml") << QString("Warning: type not found in namespace at %1:4:17") << QString(); + // TODO: This fails but currently for the wrong reasons, make sure to add a warning message requirement + // once it does fail properly in order to avoid regressions. + QTest::newRow("segFault (bad)") + << QStringLiteral("SegFault.bad.qml") + << QString() + << QString(); } void TestQmllint::dirtyQmlCode() @@ -338,12 +344,14 @@ void TestQmllint::cleanQmlCode_data() QTest::newRow("jsmoduleimport") << QStringLiteral("jsmoduleimport.qml"); QTest::newRow("overridescript") << QStringLiteral("overridescript.qml"); QTest::newRow("multiExtension") << QStringLiteral("multiExtension.qml"); + QTest::newRow("segFault") << QStringLiteral("SegFault.qml"); } void TestQmllint::cleanQmlCode() { QFETCH(QString, filename); const QString warnings = runQmllint(filename, true); + QEXPECT_FAIL("segFault", "This property exists and should not produce a warning", Abort); QVERIFY2(warnings.isEmpty(), qPrintable(warnings)); } @@ -388,6 +396,8 @@ QString TestQmllint::runQmllint(const QString &fileToLint, bool shouldSucceed, c return runQmllint(fileToLint, [&](QProcess &process) { QVERIFY(process.waitForFinished()); QCOMPARE(process.exitStatus(), QProcess::NormalExit); + + QEXPECT_FAIL("segFault", "This property exists and should not produce a warning", Abort); if (shouldSucceed) QCOMPARE(process.exitCode(), 0); else |