Revert "Enable tests for gazebosim#202 on macOS with Xcode 12+, add c…

…atalina workflow (gazebosim#414)" This reverts commit 0e77816.
scpeters · Dec 15, 2020 · b4c71e0 · b4c71e0
1 parent 9995007
commit b4c71e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 53 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
diff --git 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
     }