diff -rupN --no-dereference qbs-src-1.23.2/tests/auto/blackbox/tst_blackbox.cpp qbs-src-1.23.2-new/tests/auto/blackbox/tst_blackbox.cpp
--- qbs-src-1.23.2/tests/auto/blackbox/tst_blackbox.cpp 2022-10-21 12:54:35.000000000 +0200
+++ qbs-src-1.23.2-new/tests/auto/blackbox/tst_blackbox.cpp 2022-10-21 15:53:04.656620271 +0200
@@ -61,6 +61,20 @@
#define WAIT_FOR_NEW_TIMESTAMP() waitForNewTimestamp(testDataDir)
+
+static QByteArray filterStderrQbsDebug( const QByteArray& stderr )
+{
+ QByteArrayList lines = stderr.split('\n');
+ QByteArrayList output;
+ for (const QByteArray& line : lines) {
+ if (!line.startsWith("qbs") && !line.startsWith("\t")) {
+ output.append(line);
+ }
+ }
+ QTextStream(stdout) << output.join('\n') << Qt::endl;
+ return output.join('\n');
+}
+
using qbs::Internal::HostOsInfo;
using qbs::Profile;
@@ -3159,7 +3173,7 @@ void TestBlackbox::pluginDependency()
// Build the app. Plugins 1 and 2 must not be linked. Plugin 3 must be linked.
QCOMPARE(runQbs(QStringList{"--command-echo-mode", "command-line"}), 0);
- QByteArray output = m_qbsStdout + '\n' + m_qbsStderr;
+ QByteArray output = m_qbsStdout + '\n' + filterStderrQbsDebug(m_qbsStderr);
QVERIFY(!output.contains("plugin1"));
QVERIFY(!output.contains("plugin2"));
QVERIFY(!output.contains("helper2"));
@@ -3170,7 +3184,7 @@ void TestBlackbox::pluginDependency()
QCOMPARE(runQbs(QStringList{"-p", "plugin2"}), 0);
QVERIFY2(!m_qbsStdout.contains("linking"), m_qbsStdout.constData());
QCOMPARE(runQbs(QStringList{"--command-echo-mode", "command-line"}), 0);
- output = m_qbsStdout + '\n' + m_qbsStderr;
+ output = m_qbsStdout + '\n' + filterStderrQbsDebug(m_qbsStderr);
QVERIFY2(!output.contains("plugin1"), output.constData());
QVERIFY2(!output.contains("helper2"), output.constData());
QVERIFY2(output.contains("plugin2"), output.constData());
@@ -3179,7 +3193,7 @@ void TestBlackbox::pluginDependency()
WAIT_FOR_NEW_TIMESTAMP();
REPLACE_IN_FILE("plugin-dependency.qbs", "false /* marker 2 */", "true");
QCOMPARE(runQbs(QStringList{"-p", "helper1", "--command-echo-mode", "command-line"}), 0);
- output = m_qbsStdout + '\n' + m_qbsStderr;
+ output = m_qbsStdout + '\n' + filterStderrQbsDebug(m_qbsStderr);
QVERIFY2(output.contains("helper2"), output.constData());
// Check that the build dependency still works.
@@ -3373,7 +3387,7 @@ void TestBlackbox::propertyAssignmentOnN
{
QDir::setCurrent(testDataDir + "/property-assignment-on-non-present-module");
QCOMPARE(runQbs(), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
}
void TestBlackbox::propertyAssignmentInFailedModule()
@@ -5211,15 +5225,16 @@ void TestBlackbox::listPropertyOrder()
QDir::setCurrent(testDataDir + "/list-property-order");
const QbsRunParameters params(QStringList() << "-q");
QCOMPARE(runQbs(params), 0);
- const QByteArray firstOutput = m_qbsStderr;
+ QByteArray filteredStderr = filterStderrQbsDebug(m_qbsStderr);
+ const QByteArray firstOutput = filteredStderr;
QVERIFY(firstOutput.contains("listProp = [\"product\",\"higher3\",\"higher2\",\"higher1\",\"lower\"]"));
for (int i = 0; i < 25; ++i) {
rmDirR(relativeBuildDir());
QCOMPARE(runQbs(params), 0);
- if (m_qbsStderr != firstOutput)
+ if (filteredStderr != firstOutput)
break;
}
- QCOMPARE(m_qbsStderr.constData(), firstOutput.constData());
+ QCOMPARE(filteredStderr.constData(), firstOutput.constData());
}
void TestBlackbox::require()
@@ -5457,7 +5472,7 @@ void TestBlackbox::propertyPrecedence()
// Case 1: [cmdline=0,prod=0,export=0,nonleaf=0,profile=0]
QCOMPARE(runQbs(params), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QVERIFY2(m_qbsStdout.contains("scalar prop: leaf\n")
&& m_qbsStdout.contains("list prop: [\"leaf\"]\n"),
@@ -5467,7 +5482,7 @@ void TestBlackbox::propertyPrecedence()
// Case 2: [cmdline=0,prod=0,export=0,nonleaf=0,profile=1]
switchProfileContents(profile.p, s.get(), true);
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: profile\n")
@@ -5480,7 +5495,7 @@ void TestBlackbox::propertyPrecedence()
switchProfileContents(profile.p, s.get(), false);
switchFileContents(nonleafFile, true);
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: nonleaf\n")
&& m_qbsStdout.contains("list prop: [\"nonleaf\",\"leaf\"]\n"),
@@ -5489,7 +5504,7 @@ void TestBlackbox::propertyPrecedence()
// Case 4: [cmdline=0,prod=0,export=0,nonleaf=1,profile=1]
switchProfileContents(profile.p, s.get(), true);
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: nonleaf\n")
&& m_qbsStdout.contains("list prop: [\"nonleaf\",\"profile\"]\n"),
@@ -5502,7 +5517,7 @@ void TestBlackbox::propertyPrecedence()
switchFileContents(nonleafFile, false);
switchFileContents(depFile, true);
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: export\n")
&& m_qbsStdout.contains("list prop: [\"export\",\"leaf\"]\n"),
@@ -5511,7 +5526,7 @@ void TestBlackbox::propertyPrecedence()
// Case 6: [cmdline=0,prod=0,export=1,nonleaf=0,profile=1]
switchProfileContents(profile.p, s.get(), true);
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: export\n")
&& m_qbsStdout.contains("list prop: [\"export\",\"profile\"]\n"),
@@ -5551,7 +5566,7 @@ void TestBlackbox::propertyPrecedence()
switchFileContents(depFile, false);
switchFileContents(productFile, true);
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: product\n")
&& m_qbsStdout.contains("list prop: [\"product\",\"leaf\"]\n"),
@@ -5560,7 +5575,7 @@ void TestBlackbox::propertyPrecedence()
// Case 10: [cmdline=0,prod=1,export=0,nonleaf=0,profile=1]
switchProfileContents(profile.p, s.get(), true);
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: product\n")
&& m_qbsStdout.contains("list prop: [\"product\",\"profile\"]\n"),
@@ -5570,7 +5585,7 @@ void TestBlackbox::propertyPrecedence()
switchProfileContents(profile.p, s.get(), false);
switchFileContents(nonleafFile, true);
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: product\n")
&& m_qbsStdout.contains("list prop: [\"product\",\"nonleaf\",\"leaf\"]\n"),
@@ -5579,7 +5594,7 @@ void TestBlackbox::propertyPrecedence()
// Case 12: [cmdline=0,prod=1,export=0,nonleaf=1,profile=1]
switchProfileContents(profile.p, s.get(), true);
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: product\n")
&& m_qbsStdout.contains("list prop: [\"product\",\"nonleaf\",\"profile\"]\n"),
@@ -5590,7 +5605,7 @@ void TestBlackbox::propertyPrecedence()
switchFileContents(nonleafFile, false);
switchFileContents(depFile, true);
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: product\n")
&& m_qbsStdout.contains("list prop: [\"product\",\"export\",\"leaf\"]\n"),
@@ -5599,7 +5614,7 @@ void TestBlackbox::propertyPrecedence()
// Case 14: [cmdline=0,prod=1,export=1,nonleaf=0,profile=1]
switchProfileContents(profile.p, s.get(), true);
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: product\n")
&& m_qbsStdout.contains("list prop: [\"product\",\"export\",\"profile\"]\n"),
@@ -5609,7 +5624,7 @@ void TestBlackbox::propertyPrecedence()
switchProfileContents(profile.p, s.get(), false);
switchFileContents(nonleafFile, true);
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: product\n")
&& m_qbsStdout.contains("list prop: [\"product\",\"export\",\"nonleaf\",\"leaf\"]\n"),
@@ -5618,7 +5633,7 @@ void TestBlackbox::propertyPrecedence()
// Case 16: [cmdline=0,prod=1,export=1,nonleaf=1,profile=1]
switchProfileContents(profile.p, s.get(), true);
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: product\n")
&& m_qbsStdout.contains("list prop: [\"product\",\"export\",\"nonleaf\",\"profile\"]\n"),
@@ -5632,7 +5647,7 @@ void TestBlackbox::propertyPrecedence()
switchFileContents(productFile, false);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5642,7 +5657,7 @@ void TestBlackbox::propertyPrecedence()
switchProfileContents(profile.p, s.get(), true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5653,7 +5668,7 @@ void TestBlackbox::propertyPrecedence()
switchFileContents(nonleafFile, true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5663,7 +5678,7 @@ void TestBlackbox::propertyPrecedence()
switchProfileContents(profile.p, s.get(), true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5675,7 +5690,7 @@ void TestBlackbox::propertyPrecedence()
switchFileContents(depFile, true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5685,7 +5700,7 @@ void TestBlackbox::propertyPrecedence()
switchProfileContents(profile.p, s.get(), true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5696,7 +5711,7 @@ void TestBlackbox::propertyPrecedence()
switchFileContents(nonleafFile, true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5706,7 +5721,7 @@ void TestBlackbox::propertyPrecedence()
switchProfileContents(profile.p, s.get(), true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5719,7 +5734,7 @@ void TestBlackbox::propertyPrecedence()
switchFileContents(productFile, true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5729,7 +5744,7 @@ void TestBlackbox::propertyPrecedence()
switchProfileContents(profile.p, s.get(), true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5740,7 +5755,7 @@ void TestBlackbox::propertyPrecedence()
switchFileContents(nonleafFile, true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5750,7 +5765,7 @@ void TestBlackbox::propertyPrecedence()
switchProfileContents(profile.p, s.get(), true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5762,7 +5777,7 @@ void TestBlackbox::propertyPrecedence()
switchFileContents(depFile, true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5772,7 +5787,7 @@ void TestBlackbox::propertyPrecedence()
switchProfileContents(profile.p, s.get(), true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5783,7 +5798,7 @@ void TestBlackbox::propertyPrecedence()
switchFileContents(nonleafFile, true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5793,7 +5808,7 @@ void TestBlackbox::propertyPrecedence()
switchProfileContents(profile.p, s.get(), true);
resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline";
QCOMPARE(runQbs(resolveParams), 0);
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n")
&& m_qbsStdout.contains("list prop: [\"cmdline\"]\n"),
@@ -5850,7 +5865,7 @@ void TestBlackbox::propertiesInExportIte
QCOMPARE(runQbs(), 0);
QVERIFY(regularFileExists(relativeExecutableFilePath("p1")));
QVERIFY(regularFileExists(relativeExecutableFilePath("p2")));
- QVERIFY2(m_qbsStderr.isEmpty(), m_qbsStderr.constData());
+ QVERIFY2(filterStderrQbsDebug(m_qbsStderr).isEmpty(), m_qbsStderr.constData());
}
void TestBlackbox::protobuf_data()