1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: fixed tst_qundogroup and removed CONFIG+=insignificant_test

Browse Source 
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>
This commit is contained in:
Rohan McGovern 2011-08-02 12:35:01 +10:00 committed by Qt by Nokia
parent beb3dfed07
commit 69d6012de4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/qundogroup/qundogroup.pro
View File

@ -1,5 +1,3 @@
CONFIG += qttest_p4 CONFIG += qttest_p4
SOURCES += tst_qundogroup.cpp SOURCES += tst_qundogroup.cpp
TARGET = tst_qundogroup TARGET = tst_qundogroup
CONFIG+=insignificant_test

5
tests/auto/qundogroup/tst_qundogroup.cpp
View File

@ -608,6 +608,11 @@ void tst_QUndoGroup::addStackAndDie()
void tst_QUndoGroup::commandTextFormat() void tst_QUndoGroup::commandTextFormat()
{ {
QString binDir = QLibraryInfo::location(QLibraryInfo::BinariesPath); 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")); QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/qundogroup.ts"));
QTranslator translator; QTranslator translator;