Skip to content

FileFormatTest: Provide data to MOC for big endian tests #2479

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
pkturner wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

FileFormatTest: Provide data to MOC for big endian tests #2479

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
12 changes: 8 additions & 4 deletions test/file_format_t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1673,7 +1673,6 @@ void FileFormatTest::ocdAreaSymbolTest_data()
{
QTest::addColumn<int>("format_version");

#ifndef MAPPER_BIG_ENDIAN
static struct { int version; const char* id; } const tests[] = {
{ 8, "OCD8" },
{ 9, "OCD9" },
Expand All @@ -1685,7 +1684,6 @@ void FileFormatTest::ocdAreaSymbolTest_data()
{
QTest::newRow(t.id) << t.version;
}
#endif
}

void FileFormatTest::ocdAreaSymbolTest()
Expand All @@ -1694,6 +1692,10 @@ void FileFormatTest::ocdAreaSymbolTest()

auto* format_id = QTest::currentDataTag();
const auto* format = FileFormats.findFormat(format_id);
#ifdef MAPPER_BIG_ENDIAN
if (QByteArray(format_id).startsWith("OCD"))
QEXPECT_FAIL("", "OCD format not support on big endian systems", Abort);
#endif
QVERIFY(format);

static const auto filepath = QString::fromLatin1("data:rotated-pattern.omap");
Expand Down Expand Up @@ -1795,7 +1797,6 @@ void FileFormatTest::ocdTextSymbolTest_data()
{
QTest::addColumn<int>("format_version");

#ifndef MAPPER_BIG_ENDIAN
static struct { int version; const char* id; } const tests[] = {
{ 8, "OCD8" },
{ 9, "OCD9" },
Expand All @@ -1807,7 +1808,6 @@ void FileFormatTest::ocdTextSymbolTest_data()
{
QTest::newRow(t.id) << t.version;
}
#endif
}

void FileFormatTest::ocdTextSymbolTest()
Expand All @@ -1816,6 +1816,10 @@ void FileFormatTest::ocdTextSymbolTest()

auto* format_id = QTest::currentDataTag();
const auto* format = FileFormats.findFormat(format_id);
#ifdef MAPPER_BIG_ENDIAN
if (QByteArray(format_id).startsWith("OCD"))
QEXPECT_FAIL("", "OCD format not support on big endian systems", Abort);
#endif
QVERIFY(format);

static const auto filepath = QString::fromLatin1("data:text-symbol.omap");
Expand Down