LibreOffice/core
1
0
Fork 0
mirror of https://github.com/LibreOffice/core.git synced 2025-07-26 15:45:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop slashes after $(dir ...) in UITest.mk

Browse Source 
GNU make's dir guarantees trailing slash. With these extra slashes,
I see this when running UITests on Windows:

C:/lo/build/workdir/UITest/calc_tests8//soffice.out.log: <<<
cat: 'C:/lo/build/workdir/UITest/calc_tests8//soffice.out.log': No such file or directory
 >>>

Change-Id: Iee51a8efe654c083da6361d5789774755be79641
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188081
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2025-07-20 10:29:36 +02:00
parent 083d833b59
commit 32ba891829
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
solenv/gbuild/UITest.mk
View File

@ -62,7 +62,7 @@ else
$(call gb_Trace_StartRange,$*,UIT) $(call gb_Trace_StartRange,$*,UIT)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
rm -rf $(dir $(call gb_UITest_get_target,$*)) && \ rm -rf $(dir $(call gb_UITest_get_target,$*)) && \
mkdir -p $(dir $(call gb_UITest_get_target,$*))/user/user && \ mkdir -p $(dir $(call gb_UITest_get_target,$*))user/user && \
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 && \ 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),, \ $(if $(gb_UITest__interactive),, \
rm -fr $@.core && mkdir -p $(dir $(call gb_UITest_get_target,$*))user/ && mkdir $@.core && cd $@.core && ) \ rm -fr $@.core && mkdir -p $(dir $(call gb_UITest_get_target,$*))user/ && mkdir $@.core && cd $@.core && ) \
@ -71,7 +71,7 @@ else
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \ $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
$(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \ $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
$(DEFS) \ $(DEFS) \
$(if $(filter WNT,$(OS)),SAL_LOG_FILE="$(dir $(call gb_UITest_get_target,$*))/soffice.out.log") \ $(if $(filter WNT,$(OS)),SAL_LOG_FILE="$(dir $(call gb_UITest_get_target,$*))soffice.out.log") \
TEST_LIB=$(call gb_Library_get_target,test) \ TEST_LIB=$(call gb_Library_get_target,test) \
UNOTEST_LIB=$(call gb_Library_get_target,unotest) \ UNOTEST_LIB=$(call gb_Library_get_target,unotest) \
URE_BOOTSTRAP=vnd.sun.star.pathname:$(call gb_Helper_get_rcfile,$(INSTROOT)/$(LIBO_ETC_FOLDER)/fundamental) \ URE_BOOTSTRAP=vnd.sun.star.pathname:$(call gb_Helper_get_rcfile,$(INSTROOT)/$(LIBO_ETC_FOLDER)/fundamental) \
@ -94,8 +94,8 @@ else
RET=$$?; \ RET=$$?; \
$(call gb_CppunitTest_postprocess,$(gb_UITest_EXECUTABLE_GDB),$@.core,$$RET) >> $@.log 2>&1;) \ $(call gb_CppunitTest_postprocess,$(gb_UITest_EXECUTABLE_GDB),$@.core,$$RET) >> $@.log 2>&1;) \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
printf '%s: <<<\n' $(dir $(call gb_UITest_get_target,$*))/soffice.out.log; \ printf '%s: <<<\n' $(dir $(call gb_UITest_get_target,$*))soffice.out.log; \
cat $(dir $(call gb_UITest_get_target,$*))/soffice.out.log; \ cat $(dir $(call gb_UITest_get_target,$*))soffice.out.log; \
printf ' >>>\n\n';) \ printf ' >>>\n\n';) \
cat $@.log; $(gb_UITest_UNITTESTFAILED) UI $*)))) cat $@.log; $(gb_UITest_UNITTESTFAILED) UI $*))))
$(call gb_Trace_EndRange,$*,UIT) $(call gb_Trace_EndRange,$*,UIT)