diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2018-06-13 16:35:40 +0300 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2018-11-26 07:06:59 +0000 |
| commit | 71bd06d516a2410ae0ea698e79dcb94aba9bc5b4 (patch) | |
| tree | 75ca3d56d9a02711bf20325a1507b157d5eb79c7 /tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp | |
| parent | d8b401959f6f58bc80f767684b250dd4589735d6 (diff) | |
Make developer build tests pass for boot2qt
Some tests were fixed and others were skipped/blacklisted.
Task-number: QTBUG-63152
Change-Id: Ica7df555f8d152ee589865911130525101d4b941
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp')
| -rw-r--r-- | tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp index 3de777653e..e316ce9acb 100644 --- a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp +++ b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp @@ -369,6 +369,12 @@ static inline QFileInfo findSh() void tst_qstandardpaths::testFindExecutable_data() { +#ifdef SKIP_FINDEXECUTABLE + // Test needs to be skipped or Q_ASSERT below will cancel the test + // and report FAIL regardless of BLACKLIST contents + QSKIP("QTBUG-64404"); +#endif + QTest::addColumn<QString>("directory"); QTest::addColumn<QString>("needle"); QTest::addColumn<QString>("expected"); |