[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - solenv/gbuild

[Katarina Behrens]

 solenv/gbuild/CppunitTest.mk |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit b66011433ffc13243eef235300cd86bc65f2c4d7
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Wed Jun 15 14:07:16 2016 +0200

    Unset VCL_HIDE_WINDOWS for the purpose of taking screenshots
    
    those cppunit tests need to run in non-headless mode with dialog
    windows exposed (i.e. VCL_HIDE_WINDOWS must not be set)
    
    To preserve the current behaviour (VCL_HIDE_WINDOWS is set always
    on Win and Mac, and in use_vcl_non_headless case on Linux), introduce
    2 new variables:
    
    gb_CppunitTest_show_windows: unset VCL_HIDE_WINDOWS unconditionally
    gb_CppunitTest_hide_windows: set VCL_HIDE_WINDOWS=1 if HEADLESS is empty
    
    (i.e. let's not use emptiness of HEADLESS as an indicator, as it is
    empty in 2 mutually exclusive cases)
    
    Change-Id: Ib2f7a9cfb1202944d10856c44b6ac7c41156b333

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 5ab32ca..ff60649 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -95,6 +95,8 @@ $(call gb_CppunitTest_get_clean_target,%) :
 $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS)
 	$(call gb_Output_announce,$*,$(true),CUT,2)
 	$(call gb_Helper_abbreviate_dirs,\
+	        $(if $(gb_CppunitTest_vcl_hide_windows),VCL_HIDE_WINDOWS=1 && ) \
+	        $(if $(gb_CppunitTest_vcl_show_windows),unset VCL_HIDE_WINDOWS && ) \
 		mkdir -p $(dir $@) && \
 		rm -fr $@.user && mkdir $@.user && \
 		$(if $(gb_CppunitTest__use_confpreinit), \
@@ -105,7 +107,6 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS)
 		($(gb_CppunitTest_CPPTESTPRECOMMAND) \
 		$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
 		$(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
-		$(if $(HEADLESS),,VCL_HIDE_WINDOWS=1) \
 		$(gb_CppunitTest_malloc_check) \
 		$(if $(strip $(PYTHON_URE)),\
 			PYTHONDONTWRITEBYTECODE=1) \
@@ -206,6 +207,14 @@ endef
 
 define gb_CppunitTest_use_vcl_non_headless
 $(call gb_CppunitTest_get_target,$(1)) : HEADLESS :=
+$(call gb_CppunitTest_get_target,$(1)) : gb_CppunitTest_vcl_hide_windows := $(true)
+$(call gb_CppunitTest__use_vcl,$(1),$(false))
+
+endef
+
+define gb_CppunitTest_use_vcl_non_headless_with_windows
+$(call gb_CppunitTest_get_target,$(1)) : HEADLESS :=
+$(call gb_CppunitTest_get_target,$(1)) : gb_CppunitTest_vcl_show_windows := $(true)
 $(call gb_CppunitTest__use_vcl,$(1),$(false))
 
 endef