Add ExtraTestMacros target

BUILD.bazel

@@ -46,6 +46,29 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "ExtraTestMacros",
+    hdrs = [
+        "include/gz/utils/ExtraTestMacros.hh",
+        "include/gz/utils/detail/ExtraTestMacros.hh",
+    ],
+    includes = ["include"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":SuppressWarning",
+    ],
+)
+
+cc_test(
+    name = "ExtraTestMacros_TEST",
+    srcs = ["src/ExtraTestMacros_TEST.cc"],
+    deps = [
+        ":ExtraTestMacros",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
+    ],
+)
+
 cc_library(
     name = "ImplPtr",
     hdrs = [

include/gz/utils/ExtraTestMacros.hh

@@ -25,14 +25,24 @@
 /// as part of the test suite execution.
 /// The macro uses the Disabled_ prefix provided by googletest. See
 /// https://chromium.googlesource.com/external/github.com/google/googletest/+/HEAD/googletest/docs/advanced.md
+/// TODO(gz-utils4): remove the windows alias
 #define GZ_UTILS_TEST_ENABLED_ONLY_ON_WINDOWS(TestName) \
-  DETAIL_GZ_UTILS_TEST_ENABLED_ONLY_ON_WINDOWS(TestName)
+  DETAIL_GZ_UTILS_TEST_ENABLED_ONLY_ON_WIN32(TestName)
+
+/// Other platforms will get the test compiled but it won't be run
+/// \brief Restrict the execution of the test to just the Windows platform
+/// as part of the test suite execution.
+/// The macro uses the Disabled_ prefix provided by googletest. See
+/// https://chromium.googlesource.com/external/github.com/google/googletest/+/HEAD/googletest/docs/advanced.md
+#define GZ_UTILS_TEST_ENABLED_ONLY_ON_WIN32(TestName) \
+  DETAIL_GZ_UTILS_TEST_ENABLED_ONLY_ON_WIN32(TestName)
 
 /// \brief Restrict the execution of the test for the Windows platform.
 /// The test will be compiled on Windows too but will never be run as
 /// part of the test suite. The macro uses the Disabled_ prefix provided
 /// by googletest. See
 /// https://chromium.googlesource.com/external/github.com/google/googletest/+/HEAD/googletest/docs/advanced.md
+/// TODO(gz-utils4): remove the win32 alias
 #define GZ_UTILS_TEST_DISABLED_ON_WIN32(TestName) \
   DETAIL_GZ_UTILS_TEST_DISABLED_ON_WIN32(TestName)
 

src/ExtraTestMacros_TEST.cc

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <gtest/gtest.h>
+
+#include <gz/utils/ExtraTestMacros.hh>
+
+GTEST_TEST(ExtraTestMacros, GZ_UTILS_TEST_ENABLED_ONLY_ON_WIN32(OnlyWindowsOn))
+{
+  ASSERT_TRUE(true);
+}
+
+GTEST_TEST(ExtraTestMacros, GZ_UTILS_TEST_DISABLED_ON_WIN32(OnlyWindowsOff))
+{
+  ASSERT_TRUE(true);
+}
+
+GTEST_TEST(ExtraTestMacros, GZ_UTILS_TEST_ENABLED_ONLY_ON_MAC(OnlyMacOn))
+{
+  ASSERT_TRUE(true);
+}
+
+GTEST_TEST(ExtraTestMacros, GZ_UTILS_TEST_DISABLED_ON_MAC(OnlyMacOff))
+{
+  ASSERT_TRUE(true);
+}
+
+GTEST_TEST(ExtraTestMacros, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(OnlyLinuxOn))
+{
+  ASSERT_TRUE(true);
+}
+
+GTEST_TEST(ExtraTestMacros, GZ_UTILS_TEST_DISABLED_ON_LINUX(OnlyLinuxOff))
+{
+  ASSERT_TRUE(true);
+}
+
+GTEST_TEST(ExtraTestMacros, GZ_UTILS_TEST_ENABLED_ONLY_ON_ARM32(OnlyArm32On))
+{
+  ASSERT_TRUE(true);
+}
+
+GTEST_TEST(ExtraTestMacros, GZ_UTILS_TEST_DISABLED_ON_ARM32(OnlyArm32Off))
+{
+  ASSERT_TRUE(true);
+}
+
+GTEST_TEST(ExtraTestMacros, GZ_UTILS_TEST_ENABLED_ONLY_ON_ARM64(OnlyArm64On))
+{
+  ASSERT_TRUE(true);
+}
+
+GTEST_TEST(ExtraTestMacros, GZ_UTILS_TEST_DISABLED_ON_ARM64(OnlyArm64Off))
+{
+  ASSERT_TRUE(true);
+}