[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Stephan Bergmann]

Tomáš, you are aware that that commit required follow-up fixing in sal?

On 04/04/2012 11:15 AM, Tomáš Chvátal wrote:
>   solenv/gbuild/CppunitTest.mk |    1 +
>   1 file changed, 1 insertion(+)
>
> New commits:
> commit 141fdfa04807f49b1c4e89a90b477cc1714fc726
> Author: Tomáš Chvátal<tchvatal at suse.cz>
> Date:   Tue Apr 3 14:21:23 2012 +0200
>
>      always pass --headless to cppunits
>
>      They should not need any actual UI anyway, and most of them already
>      pass the option manually.
>      http://lists.freedesktop.org/archives/libreoffice/2012-March/029109.html
>
>      This is partial code grab as cherry-pick had the test-mk files collisions
>      all over the place. I pick only the additional define which results in some
>      tests adding --headless twice, which does no harm.
>
>      Author: Luboš Luňák<l.lunak at suse.cz>
>      Signed-off-by: Tomáš Chvátal<tchvatal at suse.cz>
>
> diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
> index 0d8959e..826d3f5 100644
> --- a/solenv/gbuild/CppunitTest.mk
> +++ b/solenv/gbuild/CppunitTest.mk
> @@ -61,6 +61,7 @@ gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS_FOR_BUILD)),/)$(1)
>   gb_CppunitTest__get_uno_type_target = $(OUTDIR)/bin/$(1).rdb
>   define gb_CppunitTest__make_args
>   $(ARGS) \
> +--headless \
>   $(if $(strip $(UNO_TYPES)),\
>   	"-env:UNO_TYPES=$(foreach rdb,udkapi $(UNO_TYPES),\
>   		$(call gb_CppunitTarget__make_url,$(call gb_CppunitTest__get_uno_type_target,$(rdb))))") \