From f408a903c71b05a54e9f754d5c63b0e96c293b1f Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 14 Dec 2020 16:42:40 -0800 Subject: [PATCH] Re-disable tests for #202, since they are broken This reverts part of commit 0e778165ce43152acee9b9e9863ce6e1066fa26d. Signed-off-by: Steve Peters --- src/SDF_TEST.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/SDF_TEST.cc b/src/SDF_TEST.cc index ccc2e718c..a947cf55c 100644 --- a/src/SDF_TEST.cc +++ b/src/SDF_TEST.cc @@ -132,9 +132,9 @@ TEST(SDF, UpdateElement) staticParam->Get(flagCheck); EXPECT_EQ(flagCheck, fixture.flag); poseParam->Get(poseCheck); - // test fails on homebrew with Xcode 11 and earlier, see issue 202 + // test fails on homebrew see issue 202 // https://github.com/osrf/sdformat/issues/202 -#if !(defined(__APPLE__) && defined(__clang_major__) && __clang_major__ < 12) +#ifndef __APPLE__ EXPECT_EQ(poseCheck, fixture.pose); #endif } @@ -419,9 +419,9 @@ TEST(SDF, GetAny) } catch(std::bad_any_cast &/*_e*/) { - // test fails on homebrew with Xcode 11 and earlier, see issue 202 + // test fails on homebrew see issue 202 // https://github.com/osrf/sdformat/issues/202 -#if !(defined(__APPLE__) && defined(__clang_major__) && __clang_major__ < 12) +#ifndef __APPLE__ FAIL(); #endif } @@ -437,9 +437,9 @@ TEST(SDF, GetAny) } catch(std::bad_any_cast &/*_e*/) { - // test fails on homebrew with Xcode 11 and earlier, see issue 202 + // test fails on homebrew see issue 202 // https://github.com/osrf/sdformat/issues/202 -#if !(defined(__APPLE__) && defined(__clang_major__) && __clang_major__ < 12) +#ifndef __APPLE__ FAIL(); #endif } @@ -481,9 +481,9 @@ TEST(SDF, GetAny) } catch(std::bad_any_cast &/*_e*/) { - // test fails on homebrew with Xcode 11 and earlier, see issue 202 + // test fails on homebrew see issue 202 // https://github.com/osrf/sdformat/issues/202 -#if !(defined(__APPLE__) && defined(__clang_major__) && __clang_major__ < 12) +#ifndef __APPLE__ FAIL(); #endif }