diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-03-18 18:54:15 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-03-19 21:08:16 +0000 |
| commit | 5b878718b90fe10a0c9a41777ebb8b22330bad3b (patch) | |
| tree | 42790aff5849336b9e355d6e3e639b1c26669a79 /solenv | |
| parent | 7b3825c66e7a7d7430404637261c41fd1ef0fbf8 (diff) | |
uitest: allow to specify a different configuration for tests
Change-Id: I29dec3237c46007a5c3dce02d70052a4891ec73f
Reviewed-on: https://gerrit.libreoffice.org/35439
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UITest.mk | 8 |
1 files changed, 7 insertions, 1 deletions
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 |