diff --git a/tests/modeltests/tst_disassemblyoutput.cpp b/tests/modeltests/tst_disassemblyoutput.cpp index ebfb4139..a1b13450 100644 --- a/tests/modeltests/tst_disassemblyoutput.cpp +++ b/tests/modeltests/tst_disassemblyoutput.cpp @@ -263,11 +263,12 @@ private slots: }; for (const auto& line : result.disassemblyLines) { - QVERIFY(!line.branchVisualisation.isEmpty()); - - // check that we only captures valid visualisation characters - QVERIFY(std::all_of(line.branchVisualisation.cbegin(), line.branchVisualisation.cend(), - isValidVisualisationCharacter)); + // not every architecture emits branch visualisation for every line (e.g. ppc64el) + if (!line.branchVisualisation.isEmpty()) { + // check that we only capture valid visualisation characters + QVERIFY(std::all_of(line.branchVisualisation.cbegin(), line.branchVisualisation.cend(), + isValidVisualisationCharacter)); + } QVERIFY(std::all_of(line.hexdump.cbegin(), line.hexdump.cend(), isValidHexdumpCharacter)); @@ -392,8 +393,7 @@ private slots: }; static FunctionData findAddressAndSizeOfFunc(const QString& library, const QString& name) { - QRegularExpression regex(QStringLiteral("[ ]+[0-9]+: ([0-9a-f]+)[ ]+([0-9]+)[0-9 a-zA-Z]+%1\\n").arg(name)); - + QRegularExpression regex(QStringLiteral("[ ]+[0-9]+: ([0-9a-f]+)[ ]+([0-9]+)[^\\n]+%1").arg(name)); const auto readelfBinary = QStandardPaths::findExecutable(QStringLiteral("readelf")); VERIFY_OR_THROW(!readelfBinary.isEmpty());