sal/CppunitTest_sal_osl.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e67fa2e3130495ace53412cc167b49670e3d8351
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Feb 10 11:57:56 2021 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Feb 10 14:34:33 2021 +0100
Fix dependency of CppunitTest_sal_osl on CppunitTest_Module_DLL library
The former only depends on the latter's library, not on actually running the
latter test. (Something like
> $ make CppunitTest_sal_osl
CPPUNIT_TEST_NAME=osl_FileBase::SystemPath_FileURL::getSystemPathFromFileURL_005
> make -j 12 -rs -f Makefile.gbuild CppunitTest_sal_osl
> [CUT] Module_DLL
>
> Fatal error: CPPUNIT_TEST_NAME contains no valid tests
>
> Error: a unit test failed, please do one of:
>
> make CppunitTest_Module_DLL CPPUNITTRACE="gdb --args"
> # for interactive debugging on Linux
> make CppunitTest_Module_DLL VALGRIND=memcheck
> # for memory checking
> make CppunitTest_Module_DLL DEBUGCPPUNIT=TRUE
> # for exception catching
>
> You can limit the execution to just one particular test by:
>
> make CPPUNIT_TEST_NAME="testXYZ" ...above mentioned params...
>
> make[1]: *** [solenv/gbuild/CppunitTest.mk:125:
workdir/CppunitTest/Module_DLL.test] Error 1
> make: *** [Makefile:166: CppunitTest_sal_osl] Error 2
thus used to fail rather unexpectedly.)
Change-Id: Id6051b192679d598100bbb5eae854bef59af9f44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110698
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sal/CppunitTest_sal_osl.mk b/sal/CppunitTest_sal_osl.mk
index 2e4b77509f56..b5e1b0658324 100644
--- a/sal/CppunitTest_sal_osl.mk
+++ b/sal/CppunitTest_sal_osl.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl,\
# the test uses the library created by Module_DLL
$(call gb_CppunitTest_get_target,sal_osl) : \
- $(call gb_CppunitTest_get_target,Module_DLL)
+ $(call gb_LinkTarget_get_target,$(call
gb_CppunitTest_get_linktarget,Module_DLL))
$(eval $(call gb_CppunitTest_use_executable,sal_osl,osl_process_child))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
