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

Michael Stahl mstahl at redhat.com
Wed Jan 4 15:08:49 UTC 2017


 solenv/gbuild/CppunitTest.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 45fca9b0d23f8a3bad6d6cdd2d8aedfd3ef6a21e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jan 4 14:18:49 2017 +0100

    gbuild: CppunitTest: export VCL_HIDE_WINDOWS
    
    This currently has no effect and so the CppunitTest_cppcanvas_emfplus
    pops up an annoying window.
    
    (regression from 181932b31ea9c07a9bec3677e73b67a9a6d4e3f2)
    
    Change-Id: I26314d98f10f6b39ca1c28821ccd0de6ba2a4358
    (cherry picked from commit bde8054e1801ffd2e4bcdb7b4d6ba08f5ceddd6a)
    Reviewed-on: https://gerrit.libreoffice.org/32726
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 95f5fbc..cc53230 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -100,7 +100,7 @@ $(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_hide_windows),export VCL_HIDE_WINDOWS=1 && ) \
 	        $(if $(gb_CppunitTest_vcl_show_windows),unset VCL_HIDE_WINDOWS && ) \
 		mkdir -p $(dir $@) && \
 		rm -fr $@.user && mkdir $@.user && \


More information about the Libreoffice-commits mailing list