-if(MIR_TEST_PLATFORM STREQUAL "mesa-kms" OR MIR_TEST_PLATFORM STREQUAL "mesa-x11") +if(MIR_BUILD_PLATFORM_MESA_KMS OR MIR_BUILD_PLATFORM_MESA_X11) ... +#ifdef MIR_BUILD_PLATFORM_MESA_X11 + ON_CALL(mock_x11, XOpenDisplay(_)).WillByDefault(Return(nullptr)); +#endif
Should the test setup really depend on the *build* platform? (Or is this poor naming - should MIR_BUILD_PLATFORM_* really be MIR_TARGET_PLATFORM_*)
« Back to merge proposal
-if(MIR_ TEST_PLATFORM STREQUAL "mesa-kms" OR MIR_TEST_PLATFORM STREQUAL "mesa-x11") BUILD_PLATFORM_ MESA_KMS OR MIR_BUILD_ PLATFORM_ MESA_X11) PLATFORM_ MESA_X11 _)).WillByDefau lt(Return( nullptr) );
+if(MIR_
...
+#ifdef MIR_BUILD_
+ ON_CALL(mock_x11, XOpenDisplay(
+#endif
Should the test setup really depend on the *build* platform? (Or is this poor naming - should MIR_BUILD_ PLATFORM_ * really be MIR_TARGET_ PLATFORM_ *)