diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-06-05 18:12:13 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-06-06 14:30:52 +0200 |
| commit | cd97ec90e12e572c431fd6edd650afa95332a0e0 (patch) | |
| tree | 9bcfafd553c25507ca1a01d3fb4d22f357adfb97 /tests | |
| parent | 268865fc05508deb6a67ef5389fd05bc499581ac (diff) | |
fix TestBlackbox::usingsAsSoleInputsNonMultiplexed
Do not add bool to string, and fix the output file names of
the custom-plus rule.
Change-Id: If5fec2adc43dcf9639c3fd56c5d84693f3d6bc78
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs index bf34cc8e6..80644232e 100644 --- a/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs +++ b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs @@ -45,7 +45,7 @@ Project { Rule { usings: "custom" Artifact { - fileName: FileInfo.baseName(input.filePath) + ".plus" + fileName: FileInfo.fileName(input.filePath) + ".plus" fileTags: "custom-plus" } prepare: { diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index fcf3cf14a..eb3e01394 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -498,8 +498,8 @@ void TestBlackbox::usingsAsSoleInputsNonMultiplexed() QDir::setCurrent(testDataDir + QLatin1String("/usings-as-sole-inputs-non-multiplexed")); QCOMPARE(runQbs(), 0); const QString p3BuildDir = productBuildDir("p3"); - QVERIFY(regularFileExists(p3BuildDir) + "/custom1.out.plus"); - QVERIFY(regularFileExists(p3BuildDir) + "/custom2.out.plus"); + QVERIFY(regularFileExists(p3BuildDir + "/custom1.out.plus")); + QVERIFY(regularFileExists(p3BuildDir + "/custom2.out.plus")); } static bool symlinkExists(const QString &linkFilePath) |