diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-06-15 14:07:16 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2016-08-18 02:39:08 +0200 |
| commit | 181932b31ea9c07a9bec3677e73b67a9a6d4e3f2 (patch) | |
| tree | a60e587ac6eba27e9a3075e2137d4393883f458d /solenv | |
| parent | 28a806d3f1a301660d68fc514e7443df43728e35 (diff) | |
screenshots: unset VCL_HIDE_WINDOWS
Those screenshot 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
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index f192b1ea789f..77aafcce3f1e 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -100,6 +100,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), \ @@ -110,7 +112,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) \ @@ -211,6 +212,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 |