Skip to content

fix: ppc64el test failures in tst_disassemblyoutput #768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Scottcjn wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Open

fix: ppc64el test failures in tst_disassemblyoutput #768

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions tests/modeltests/tst_disassemblyoutput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down Expand Up @@ -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());

Expand Down