From 1eea4773236a246cf6185f69374c27852905ff5e Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 4 Aug 2011 12:41:32 +0200 Subject: [PATCH] test: fixed tst_qundostack 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: I4696f4a178a6f8c0f2e76b5c4ae7f60c4f953334 Reviewed-on: http://codereview.qt.nokia.com/2619 Reviewed-by: Qt Sanity Bot Reviewed-by: Rohan McGovern --- tests/auto/qundostack/qundostack.pro | 2 -- tests/auto/qundostack/tst_qundostack.cpp | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/auto/qundostack/qundostack.pro b/tests/auto/qundostack/qundostack.pro index 91fdcab025..beb0b103b2 100644 --- a/tests/auto/qundostack/qundostack.pro +++ b/tests/auto/qundostack/qundostack.pro @@ -1,5 +1,3 @@ CONFIG += qttest_p4 SOURCES += tst_qundostack.cpp TARGET = tst_qundostack - -CONFIG+=insignificant_test diff --git a/tests/auto/qundostack/tst_qundostack.cpp b/tests/auto/qundostack/tst_qundostack.cpp index 5a09b9a2ae..834c2d5d50 100644 --- a/tests/auto/qundostack/tst_qundostack.cpp +++ b/tests/auto/qundostack/tst_qundostack.cpp @@ -2970,6 +2970,11 @@ void tst_QUndoStack::undoLimit() void tst_QUndoStack::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/qundostack.ts")); QTranslator translator;