diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-22 17:43:49 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-10-23 11:19:45 +0200 |
commit | 0dcc24ad2d9916177b0240102e89a8e1be02f049 (patch) | |
tree | 85848f3873fe5dad10cd2eed4d62d7ab15ed90e2 | |
parent | 3dcb37474dec023159141d83d05b72e9ecc1ae50 (diff) |
Add failing autotest for QBS-424.
Change-Id: I6a1194981bf6f679ac931a9871281c4866f3bd20
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r-- | tests/auto/api/testdata/filetagsfilter_override/InstalledApp.qbs | 10 | ||||
-rw-r--r-- | tests/auto/api/testdata/filetagsfilter_override/main.cpp | 1 | ||||
-rw-r--r-- | tests/auto/api/testdata/filetagsfilter_override/project.qbs | 11 | ||||
-rw-r--r-- | tests/auto/api/tst_api.cpp | 20 | ||||
-rw-r--r-- | tests/auto/api/tst_api.h | 1 |
5 files changed, 43 insertions, 0 deletions
diff --git a/tests/auto/api/testdata/filetagsfilter_override/InstalledApp.qbs b/tests/auto/api/testdata/filetagsfilter_override/InstalledApp.qbs new file mode 100644 index 000000000..0aabaf063 --- /dev/null +++ b/tests/auto/api/testdata/filetagsfilter_override/InstalledApp.qbs @@ -0,0 +1,10 @@ +import qbs + +CppApplication { + type: "application" + Group { + fileTagsFilter: product.type + qbs.install: true + qbs.installDir: "hurz" + } +} diff --git a/tests/auto/api/testdata/filetagsfilter_override/main.cpp b/tests/auto/api/testdata/filetagsfilter_override/main.cpp new file mode 100644 index 000000000..237c8ce18 --- /dev/null +++ b/tests/auto/api/testdata/filetagsfilter_override/main.cpp @@ -0,0 +1 @@ +int main() {} diff --git a/tests/auto/api/testdata/filetagsfilter_override/project.qbs b/tests/auto/api/testdata/filetagsfilter_override/project.qbs new file mode 100644 index 000000000..a6cec7d07 --- /dev/null +++ b/tests/auto/api/testdata/filetagsfilter_override/project.qbs @@ -0,0 +1,11 @@ +import qbs +import "InstalledApp.qbs" as InstalledApp + +InstalledApp { + files: "main.cpp" + Group { + fileTagsFilter: product.type + qbs.install: true + qbs.installDir: "habicht" + } +} diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index 513c61151..7c16f38fa 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -92,6 +92,26 @@ void TestApi::disabledInstallGroup() QCOMPARE(project.targetExecutable(product, qbs::InstallOptions()), targets.first().filePath()); } +void TestApi::fileTagsFilterOverride() +{ + qbs::SetupProjectParameters setupParams = defaultSetupParameters(); + setupParams.setProjectFilePath(QDir::cleanPath(QLatin1String(SRCDIR "/testdata" + "/filetagsfilter_override/project.qbs"))); + QScopedPointer<qbs::SetupProjectJob> job(qbs::Project::setupProject(setupParams, + m_logSink, 0)); + waitForFinished(job.data()); + QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString())); + qbs::Project project = job->project(); + qbs::ProjectData projectData = project.projectData(); + QCOMPARE(projectData.allProducts().count(), 1); + const qbs::ProductData product = projectData.allProducts().first(); + QList<qbs::InstallableFile> installableFiles + = project.installableFilesForProduct(product, qbs::InstallOptions()); + QCOMPARE(installableFiles.count(), 1); + QEXPECT_FAIL(0, "QBS-424", Continue); + QVERIFY(installableFiles.first().targetDirectory().contains("habicht")); +} + void TestApi::installableFiles() { qbs::SetupProjectParameters setupParams = defaultSetupParameters(); diff --git a/tests/auto/api/tst_api.h b/tests/auto/api/tst_api.h index c278eeccf..3ca6935ab 100644 --- a/tests/auto/api/tst_api.h +++ b/tests/auto/api/tst_api.h @@ -47,6 +47,7 @@ public: private slots: void disabledInstallGroup(); + void fileTagsFilterOverride(); void installableFiles(); void listBuildSystemFiles(); |