> -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_*)
Yeah rather poor naming. MIR_BUILD_PLATFORM indicates that we build for platform X11 .. to be honest the way autoconf names target, host and build still confuses me regularly.
Good that you mention this. This is one of the things I wanted to have another look.
> -if(MIR_ TEST_PLATFORM STREQUAL "mesa-kms" OR MIR_TEST_PLATFORM STREQUAL BUILD_PLATFORM_ MESA_KMS OR MIR_BUILD_ PLATFORM_ MESA_X11) PLATFORM_ MESA_X11 _)).WillByDefau lt(Return( nullptr) ); PLATFORM_ * really be MIR_TARGET_ PLATFORM_ *)
> "mesa-x11")
> +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_
Yeah rather poor naming. MIR_BUILD_PLATFORM indicates that we build for platform X11 .. to be honest the way autoconf names target, host and build still confuses me regularly.
Good that you mention this. This is one of the things I wanted to have another look.