solenv/gbuild/UITest.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
New commits: commit b5743ae5f576e45576426593da58fa74bb88c01b Author: Mike Kaganski <[email protected]> AuthorDate: Sat Nov 25 12:49:16 2023 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Nov 25 13:42:46 2023 +0100 Simplify UITest's custom configuration handling Change-Id: I20d7d3a17b3a0ca817ee5acdab77f51983852078 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159898 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk index 65bc37c1d1bf..334080b70a70 100644 --- a/solenv/gbuild/UITest.mk +++ b/solenv/gbuild/UITest.mk @@ -60,11 +60,9 @@ else $(call gb_Helper_abbreviate_dirs,\ rm -rf $(dir $(call gb_UITest_get_target,$*)) && \ mkdir -p $(dir $(call gb_UITest_get_target,$*))/user/user && \ - cp $(SRCDIR)/qadevOOo/qa/registrymodifications.xcu $(dir $(call gb_UITest_get_target,$*))/user/user/ && \ + cp -T $(if $(gb_UITest_use_config),$(gb_UITest_use_config),$(SRCDIR)/qadevOOo/qa/registrymodifications.xcu) $(dir $(call gb_UITest_get_target,$*))/user/user/registrymodifications.xcu && \ $(if $(gb_UITest__interactive),, \ rm -fr [email protected] && mkdir -p $(dir $(call gb_UITest_get_target,$*))user/ && mkdir [email protected] && cd [email protected] && ) \ - $(if $(gb_UITest_use_config), \ - cp $(gb_UITest_use_config) $(dir $(call gb_UITest_get_target,$*))user/user && ) \ $(call gb_CppunitTest_coredumpctl_setup,$@) \ ($(gb_UITest_PRECOMMAND) \ $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
