rpms / qbs

Clone
Source Code
GIT

Files

  1.   be9843febfcb7273b19842bee121bdcaef6d7d97
  2.   qbs_tst_blackbox_stderr.patch
Blob Blame History Raw 
diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp qbs-src-2.1.1-new/tests/auto/blackbox/tst_blackbox.cpp
--- qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp	2023-08-03 14:58:40.000000000 +0200
+++ qbs-src-2.1.1-new/tests/auto/blackbox/tst_blackbox.cpp	2023-08-04 09:53:55.486810899 +0200
@@ -62,6 +62,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;
 
@@ -3258,7 +3272,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"));
@@ -3269,7 +3283,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());
@@ -3278,7 +3292,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.
@@ -3461,7 +3475,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()
@@ -5303,15 +5317,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()
@@ -5539,7 +5554,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"),
@@ -5549,7 +5564,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")
@@ -5562,7 +5577,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"),
@@ -5571,7 +5586,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"),
@@ -5584,7 +5599,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"),
@@ -5593,7 +5608,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"),
@@ -5626,7 +5641,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"),
@@ -5635,7 +5650,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"),
@@ -5645,7 +5660,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"),
@@ -5654,7 +5669,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"),
@@ -5665,7 +5680,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"),
@@ -5674,7 +5689,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"),
@@ -5684,7 +5699,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"),
@@ -5693,7 +5708,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"),
@@ -5707,7 +5722,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"),
@@ -5717,7 +5732,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"),
@@ -5728,7 +5743,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"),
@@ -5738,7 +5753,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"),
@@ -5750,7 +5765,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"),
@@ -5760,7 +5775,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"),
@@ -5771,7 +5786,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"),
@@ -5781,7 +5796,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"),
@@ -5794,7 +5809,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"),
@@ -5804,7 +5819,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"),
@@ -5815,7 +5830,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"),
@@ -5825,7 +5840,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"),
@@ -5837,7 +5852,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"),
@@ -5847,7 +5862,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"),
@@ -5858,7 +5873,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"),
@@ -5868,7 +5883,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"),
@@ -5925,7 +5940,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()
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.