[Build-common-hackers] [PATCH] Add DEB_MAKE_CHECK_INVOKE

Emilio Pozuelo Monfort pochu at debian.org
Sat Mar 16 16:26:15 UTC 2013


Heya,

This is an untested patch, just wanted to send it quickly to see if you agree 
with the change.

The motivation as stated in bug 417398 is to be able to run 'make check' under 
some environment. Some tests require X to run, so for them we need to run make 
check under xvfb-run, otherwise they miserably fail on the buildds.

Please let me know what you think about it.

Cheers,
Emilio

On 03/16/2013 05:16 PM, Emilio Pozuelo Monfort wrote:
> If DEB_MAKE_CHECK_INVOKE is set, it's value will be used to
> run the tests, instead of DEB_MAKE_INVOKE. This is useful
> if you need to run make under e.g. xvfb-run or dbus-launch,
> so you can now do:
>
> DEB_MAKE_CHECK_TARGET = check
> DEB_MAKE_CHECK_INVOKE = xvfb-run $(MAKE)
>
> This was first suggested in
> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=417398#20
> ---
>   1/class/makefile.mk.in |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/1/class/makefile.mk.in b/1/class/makefile.mk.in
> index 8a6ff8f..4fa7b9f 100644
> --- a/1/class/makefile.mk.in
> +++ b/1/class/makefile.mk.in
> @@ -56,7 +56,7 @@ $(cdbs_make_clean_nonstamps)::
>   common-install-arch common-install-indep:: common-install-impl
>   common-install-impl:: $(cdbs_make_install_stamps)
>   $(cdbs_make_install_stamps)::
> -	$(if $(DEB_MAKE_INSTALL_TARGET),+$(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET), at echo "DEB_MAKE_INSTALL_TARGET unset, skipping default makefile.mk common-install target")
> +	$(if $(DEB_MAKE_INSTALL_TARGET),+$(if $(DEB_MAKE_CHECK_INVOKE),$(DEB_MAKE_CHECK_INVOKE),$(DEB_MAKE_INVOKE)) $(DEB_MAKE_INSTALL_TARGET), at echo "DEB_MAKE_INSTALL_TARGET unset, skipping default makefile.mk common-install target")
>   	$(if $(DEB_MAKE_INSTALL_TARGET),touch $@)
>
>   ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
>




More information about the Build-common-hackers mailing list