aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2023-07-01 13:51:20 +0300
committerIvan Komissarov <ABBAPOH@gmail.com>2023-07-04 10:54:33 +0000
commit2e6eb75c76c2d042eb07a8e6bcb4aa03b8843205 (patch)
tree1073d84cd02cea3496ebddd5e73885c9148704c3
parentef082b2ea61d2303d26add49d5148b224aa910bf (diff)
Check actual Probe props in providers test
Change-Id: I043dc6f956e4767e60e708bbda3b9e2c7a4417bc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--tests/auto/blackbox/testdata-providers/probe-in-module-provider/module-providers/provider_a.qbs5
-rw-r--r--tests/auto/blackbox/testdata-providers/probe-in-module-provider/probe-in-module-provider.qbs1
-rw-r--r--tests/auto/blackbox/tst_blackboxproviders.cpp1
3 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata-providers/probe-in-module-provider/module-providers/provider_a.qbs b/tests/auto/blackbox/testdata-providers/probe-in-module-provider/module-providers/provider_a.qbs
index 8a7c7d6ed..a1228b19c 100644
--- a/tests/auto/blackbox/testdata-providers/probe-in-module-provider/module-providers/provider_a.qbs
+++ b/tests/auto/blackbox/testdata-providers/probe-in-module-provider/module-providers/provider_a.qbs
@@ -3,14 +3,17 @@ import "../../qbs-module-providers-helpers.js" as Helpers
ModuleProvider {
Probe {
id: theProbe
+ property string theValue: "value"
configure: {
console.info("Running probe");
found = true;
}
}
+ isEager: false
property bool found: theProbe.found
+ property string theValue: theProbe.theValue
relativeSearchPaths: {
- Helpers.writeModule(outputBaseDir, "qbsmetatestmodule", undefined, undefined, found);
+ Helpers.writeModule(outputBaseDir, "qbsmetatestmodule", theValue, undefined, found);
return "";
}
}
diff --git a/tests/auto/blackbox/testdata-providers/probe-in-module-provider/probe-in-module-provider.qbs b/tests/auto/blackbox/testdata-providers/probe-in-module-provider/probe-in-module-provider.qbs
index cb346beeb..1f2b3d387 100644
--- a/tests/auto/blackbox/testdata-providers/probe-in-module-provider/probe-in-module-provider.qbs
+++ b/tests/auto/blackbox/testdata-providers/probe-in-module-provider/probe-in-module-provider.qbs
@@ -4,5 +4,6 @@ Product {
Depends { name: "qbsmetatestmodule" }
property bool dummy: {
console.info("p.qbsmetatestmodule.boolProp: " + JSON.stringify(qbsmetatestmodule.boolProp));
+ console.info("p.qbsmetatestmodule.prop: " + JSON.stringify(qbsmetatestmodule.prop));
}
}
diff --git a/tests/auto/blackbox/tst_blackboxproviders.cpp b/tests/auto/blackbox/tst_blackboxproviders.cpp
index ceb413510..9c408919c 100644
--- a/tests/auto/blackbox/tst_blackboxproviders.cpp
+++ b/tests/auto/blackbox/tst_blackboxproviders.cpp
@@ -193,6 +193,7 @@ void TestBlackboxProviders::probeInModuleProvider()
touch("probe-in-module-provider.qbs");
QCOMPARE(runQbs(), 0);
QVERIFY2(m_qbsStdout.contains("p.qbsmetatestmodule.boolProp: true"), m_qbsStdout);
+ QVERIFY2(m_qbsStdout.contains("p.qbsmetatestmodule.prop: \"value\""), m_qbsStdout);
QVERIFY2(!m_qbsStdout.contains("Running probe"), m_qbsStdout);
}