diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-20 13:42:06 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-25 08:58:16 +0000 |
| commit | 44ab895102034e7c88a1adcb8abeb6d7b83813e0 (patch) | |
| tree | eb4eb8230147549532e5d736df0c1325c4ebb22a /tests/auto/linguist/lrelease/tst_lrelease.cpp | |
| parent | 534b2648e6855167004a1afa3516acbb5850c52a (diff) | |
deduplicate test command launching a bit
pre-calculate the lrelease/lconvert path once.
Change-Id: Ia1603db955ef08e61d123393f6e69c4653d8b6a9
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tests/auto/linguist/lrelease/tst_lrelease.cpp')
| -rw-r--r-- | tests/auto/linguist/lrelease/tst_lrelease.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/linguist/lrelease/tst_lrelease.cpp b/tests/auto/linguist/lrelease/tst_lrelease.cpp index f4935208b..96f0d933f 100644 --- a/tests/auto/linguist/lrelease/tst_lrelease.cpp +++ b/tests/auto/linguist/lrelease/tst_lrelease.cpp @@ -44,7 +44,7 @@ class tst_lrelease : public QObject public: tst_lrelease() - : binDir(QLibraryInfo::location(QLibraryInfo::BinariesPath)) + : lrelease(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/lrelease") , dataDir(QFINDTESTDATA("testdata/")) {} @@ -60,7 +60,7 @@ private slots: private: void doCompare(const QStringList &actual, const QString &expectedFn); - QString binDir; + QString lrelease; QString dataDir; }; @@ -114,7 +114,7 @@ void tst_lrelease::doCompare(const QStringList &actual, const QString &expectedF void tst_lrelease::translate() { - QVERIFY(!QProcess::execute(binDir + "/lrelease " + dataDir + "translate.ts")); + QVERIFY(!QProcess::execute(lrelease + " " + dataDir + "translate.ts")); QTranslator translator; QVERIFY(translator.load(dataDir + "translate.qm")); @@ -164,7 +164,7 @@ void tst_lrelease::translate() void tst_lrelease::compressed() { - QVERIFY(!QProcess::execute(binDir + "/lrelease -compress " + dataDir + "compressed.ts")); + QVERIFY(!QProcess::execute(lrelease + " -compress " + dataDir + "compressed.ts")); QTranslator translator; QVERIFY(translator.load(dataDir + "compressed.qm")); @@ -181,7 +181,7 @@ void tst_lrelease::compressed() void tst_lrelease::idbased() { - QVERIFY(!QProcess::execute(binDir + "/lrelease -idbased " + dataDir + "idbased.ts")); + QVERIFY(!QProcess::execute(lrelease + " -idbased " + dataDir + "idbased.ts")); QTranslator translator; QVERIFY(translator.load(dataDir + "idbased.qm")); @@ -193,7 +193,7 @@ void tst_lrelease::idbased() void tst_lrelease::markuntranslated() { - QVERIFY(!QProcess::execute(binDir + "/lrelease -markuntranslated # -idbased " + dataDir + "idbased.ts")); + QVERIFY(!QProcess::execute(lrelease + " -markuntranslated # -idbased " + dataDir + "idbased.ts")); QTranslator translator; QVERIFY(translator.load(dataDir + "idbased.qm")); @@ -206,7 +206,7 @@ void tst_lrelease::markuntranslated() void tst_lrelease::dupes() { QProcess proc; - proc.start(binDir + "/lrelease " + dataDir + "dupes.ts", QIODevice::ReadWrite | QIODevice::Text); + proc.start(lrelease + " " + dataDir + "dupes.ts", QIODevice::ReadWrite | QIODevice::Text); QVERIFY(proc.waitForFinished()); QVERIFY(proc.exitStatus() == QProcess::NormalExit); doCompare(QString(proc.readAllStandardError()).trimmed().split('\n'), dataDir + "dupes.errors"); |