Skip to content
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.

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

Fix arm tests #1173

Merged
merged 4 commits into from
Sep 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/gz_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1854,6 +1854,8 @@ TEST(GraphCmd, GZ_UTILS_TEST_DISABLED_ON_WIN32(ModelFrameAttachedTo))
EXPECT_EQ(sdf::trim(expected.str()), sdf::trim(output));
}

// Disable on arm
#if !defined __ARM_ARCH
/////////////////////////////////////////////////
TEST(inertial_stats, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF))
{
Expand Down Expand Up @@ -1936,6 +1938,8 @@ TEST(inertial_stats, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF))
EXPECT_EQ(expectedOutput, output);
}
}
// #if !defined __ARM_ARCH
#endif

//////////////////////////////////////////////////
/// \brief Check help message and bash completion script for consistent flags
Expand Down
2 changes: 2 additions & 0 deletions test/integration/error_output.cc
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,13 @@ TEST(Error, ErrorOutput)
"Undefined attribute //pose[@rotation_format='invalid_format'], "
"only 'euler_rpy' and 'quat_xyzw' is supported."));
EXPECT_EQ(errors[1].Code(), sdf::ErrorCode::PARAMETER_ERROR);
#if !defined __ARM_ARCH
EXPECT_NE(std::string::npos, errors[1].Message().find(
"Failed to set value '1 2 3 0.40000000000000002 0.5 "
"0.59999999999999987' to key [] for new parent element of name '',"
" reverting to previous value '1 2 3 0.40000000000000002 0.5 "
"0.59999999999999987'."));
#endif

errors.clear();
sdf::Param param4("key", "bool", "15", false, "a", "b", errors,
Expand Down