diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-10-31 18:02:50 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-11-01 12:18:25 +0000 |
| commit | 03d1dd0112f308c048dd3939e47573c1a74aa37a (patch) | |
| tree | 33df92e63543eae4c4750f0d0c0961a9210cf4ab /tests/auto | |
| parent | bc9ffe62fe36735e946a37bd7ebf4a08513bc7b5 (diff) | |
pkgconfig: fix variables in the merged package
Change-Id: Ib143dfc99392ed129ea04d57ed8e378c7d1230a9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/pkgconfig/tst_pkgconfig.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/pkgconfig/tst_pkgconfig.cpp b/tests/auto/pkgconfig/tst_pkgconfig.cpp index 1e2ef9e2a..ec62e1a7f 100644 --- a/tests/auto/pkgconfig/tst_pkgconfig.cpp +++ b/tests/auto/pkgconfig/tst_pkgconfig.cpp @@ -93,6 +93,7 @@ void TestPkgConfig::pkgConfig() auto variables = json["Vars"].toMap(); variables["pcfiledir"] = QFileInfo(m_workingDataDir).absoluteFilePath(); + QCOMPARE(size_t(variables.size()), package.variables.size()); for (const auto &[key, value]: package.variables) { QCOMPARE(QString::fromStdString(value), variables.value(QString::fromStdString(key)).toString()); @@ -191,6 +192,10 @@ void TestPkgConfig::pkgConfig_data() << QStringLiteral("tilde") << QString() << QVariantMap(); QTest::newRow("variables") << QStringLiteral("variables") << QString() << QVariantMap(); + QTest::newRow("variables-merged") + << QStringLiteral("variables") + << QString() + << QVariantMap({{"mergeDependencies", true}}); QTest::newRow("whitespace") << QStringLiteral("whitespace") << QString() << QVariantMap(); QTest::newRow("base.name") |