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

New commits:
commit 34b95e12a839cbcf4818bbb0b2ce26b85999e856
Author:     Patrick Luby <[email protected]>
AuthorDate: Tue Oct 15 15:51:07 2024 -0400
Commit:     Ilmari Lauhakangas <[email protected]>
CommitDate: Wed Oct 16 05:57:45 2024 +0200

    On macOS the "cp" command does not have a "-T" option
    
    Change-Id: Id7d81c23e79569a74c26e5a69890b3b41f4b2aa6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174982
    Reviewed-by: Patrick Luby <[email protected]>
    Reviewed-by: Ilmari Lauhakangas <[email protected]>
    Tested-by: Jenkins

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 282df21b9112..328216d2c259 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -63,7 +63,7 @@ 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 -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 && \
+               cp $(if $(filter-out MACOSX,$(OS)),-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] && ) \
                $(call gb_CppunitTest_coredumpctl_setup,$@) \

Reply via email to