From 2e6eb75c76c2d042eb07a8e6bcb4aa03b8843205 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sat, 1 Jul 2023 13:51:20 +0300 Subject: Check actual Probe props in providers test Change-Id: I043dc6f956e4767e60e708bbda3b9e2c7a4417bc Reviewed-by: Christian Kandeler --- .../probe-in-module-provider/module-providers/provider_a.qbs | 5 ++++- .../probe-in-module-provider/probe-in-module-provider.qbs | 1 + tests/auto/blackbox/tst_blackboxproviders.cpp | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) 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); } -- cgit v1.2.3