diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-17 16:23:56 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-18 08:23:10 +0000 |
commit | 7e630a14369d30d7658ebda34ac6233ec1be1a2e (patch) | |
tree | 63080fa46ddbcfef65c7f0e8b42a5b30d3658c02 /tests | |
parent | d8f1a1b01ed947a1d70c7635945b845a6236f64e (diff) |
Do not export anything from disabled products
Before this patch, if a product had a non-required dependency on another
product and that product's condition was false, then the dependencies
from the disabled product's Export item still got into the importing
product, which is not what users expect.
The fix is achieved by splitting up the addTransitiveDependencies()
function and moving the part that is not required for determining the
dependencies between products into handleProduct(). In that function we
already have definite knowledge about which dependencies are enabled, so
we can simply filter out dependencies of modules representing products
that are disabled.
Task-number: QBS-1250
Change-Id: I787a4554b2ced3924e0c6ab7e78bd73221fbecdc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 2cf0c5003..648fdd7cb 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -3209,9 +3209,6 @@ void TestBlackbox::exportedDependencyInDisabledProduct() rmDirR(relativeBuildDir()); const QString propertyArg = "products.dep.conditionString:" + depCondition; QCOMPARE(runQbs(QStringList(propertyArg)), 0); - QEXPECT_FAIL("dependency directly disabled", "QBS-1250", Continue); - QEXPECT_FAIL("dependency disabled via non-present module", "QBS-1250", Continue); - QEXPECT_FAIL("dependency disabled via failed module", "QBS-1250", Continue); QCOMPARE(m_qbsStdout.contains("compiling"), compileExpected); } |