diff --git a/src/gz_TEST.cc b/src/gz_TEST.cc index 8522cef21..1a80c22c6 100644 --- a/src/gz_TEST.cc +++ b/src/gz_TEST.cc @@ -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)) { @@ -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 diff --git a/test/integration/error_output.cc b/test/integration/error_output.cc index d730774fd..a3fa97914 100644 --- a/test/integration/error_output.cc +++ b/test/integration/error_output.cc @@ -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,