diff options
| author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2019-07-01 17:13:27 +0200 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2019-07-02 09:14:51 +0000 |
| commit | 50332e1456353a9687be8fbc5208ef4493f644ff (patch) | |
| tree | 34ac536fc4143f2fcd684451ffe15643dacd71de | |
| parent | af4a98a671a4df5910b03a38dbee8bf2c3e6ccce (diff) | |
Do not fail in initTestCase() when cross-compiling.
We're not running the qmlMinify() test when cross-compiling, so there is no
reason to produce a failure when preparing to run that
test in initTestCase()..
For the record, we got this failure on Android:
(FAIL! : tst_qmlmin::initTestCase() qmlmin executable not found (looked
for /home/qt/work/install/bin/qmlmin)
Change-Id: I84c8bb96ff067b818dfb3d3ba23856fe1fd76a7b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | tests/auto/qml/qmlmin/tst_qmlmin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qmlmin.cpp index d1e74aecef..696ec66246 100644 --- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp +++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp @@ -64,6 +64,7 @@ tst_qmlmin::tst_qmlmin() void tst_qmlmin::initTestCase() { +#if QT_CONFIG(process) && !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled qmlminPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmlmin"); #ifdef Q_OS_WIN qmlminPath += QLatin1String(".exe"); @@ -129,6 +130,7 @@ void tst_qmlmin::initTestCase() invalidFiles << "tests/auto/qml/qjsengine/script/com/trolltech/syntaxerror/__init__.js"; invalidFiles << "tests/auto/qml/debugger/qqmlpreview/data/broken.qml"; invalidFiles << "tests/auto/qml/qqmllanguage/data/fuzzed.2.qml"; +#endif } QStringList tst_qmlmin::findFiles(const QDir &d) |