diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-08-02 12:35:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-04 16:13:17 +0200 |
| commit | 69d6012de469185aa70c86fec69fcb908acfde0c (patch) | |
| tree | 554c223cba5f05751967cbc00f6381c55ab7aa91 /tests | |
| parent | beb3dfed07b35d74050fcd40a99f705c033597f7 (diff) | |
test: fixed tst_qundogroup and removed CONFIG+=insignificant_test
This test had an invalid circular dependency: the test is in qtbase, and
it depends on lrelease in qttools, which depends on qtbase.
Change the test to skip if lrelease is not available or not working.
Change-Id: I964ddaf9485a2afed5a1bd4f88d9bdccadf1cfca
Reviewed-on: http://codereview.qt.nokia.com/2472
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qundogroup/qundogroup.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qundogroup/tst_qundogroup.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/qundogroup/qundogroup.pro b/tests/auto/qundogroup/qundogroup.pro index 9a700c64b7..587143d045 100644 --- a/tests/auto/qundogroup/qundogroup.pro +++ b/tests/auto/qundogroup/qundogroup.pro @@ -1,5 +1,3 @@ CONFIG += qttest_p4 SOURCES += tst_qundogroup.cpp TARGET = tst_qundogroup - -CONFIG+=insignificant_test diff --git a/tests/auto/qundogroup/tst_qundogroup.cpp b/tests/auto/qundogroup/tst_qundogroup.cpp index 55aa73be69..6d51252e22 100644 --- a/tests/auto/qundogroup/tst_qundogroup.cpp +++ b/tests/auto/qundogroup/tst_qundogroup.cpp @@ -608,6 +608,11 @@ void tst_QUndoGroup::addStackAndDie() void tst_QUndoGroup::commandTextFormat() { QString binDir = QLibraryInfo::location(QLibraryInfo::BinariesPath); + + if (QProcess::execute(binDir + "/lrelease -version") != 0) { + QSKIP("lrelease is missing or broken", SkipAll); + } + QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/qundogroup.ts")); QTranslator translator; |