[Libreoffice-commits] core.git: solenv/gbuild

[Markus Mohrhard]

 solenv/gbuild/UITest.mk |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 5b878718b90fe10a0c9a41777ebb8b22330bad3b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Mar 18 18:54:15 2017 +0100

    uitest: allow to specify a different configuration for tests
    
    Change-Id: I29dec3237c46007a5c3dce02d70052a4891ec73f
    Reviewed-on: https://gerrit.libreoffice.org/35439
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 2182682695e3..1edb3f769081 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -42,7 +42,9 @@ $(call gb_UITest_get_target,%) :| $(gb_UITest_DEPS)
 		rm -rf $(dir $(call gb_UITest_get_target,$*)) && \
 		mkdir -p $(dir $(call gb_UITest_get_target,$*)) && \
 		$(if $(gb_UITest__interactive),, \
-		    rm -fr $@.core && mkdir $@.core && cd $@.core && ) \
+		    rm -fr $@.core && mkdir -p $(dir $(call gb_UITest_get_target,$*))user/ && mkdir $@.core && cd $@.core && ) \
+		$(if $(gb_UITest_use_config), \
+		    cp $(gb_UITest_use_config) $(dir $(call gb_UITest_get_target,$*))user/. && ) \
 		($(gb_UITest_PRECOMMAND) \
 		$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
 		$(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
@@ -100,6 +102,10 @@ $(call gb_UITest_get_target,$(1)) : $(call gb_CustomTarget_get_workdir,$(2))
 
 endef
 
+define gb_UITest_use_configuration
+$(call gb_UITest_get_target,$(1)) : gb_UITest_use_config := $(2)
+endef
+
 
 else # DISABLE_PYTHON