Prepare to run (select) tests during Emscripten build

...by e.g. executing generated Wasm code with node.  This requires check targets
to not be skipped unconditionally, unlike for other CROSS_COMPILING builds, so
introduce gb_CAN_EXECUTE_HOST_CODE to distinguish these cases.

Which revealed that some CppunitTest targets unconditionally used artefacts that
are covered by some ENABLE_WASM_STRIP_*, so made those uses conditional
accordingly (even though the resulting binaries might actually be dysfunctional,
lacking relevant parts; we'll fix that if and when we actually build and run
them).

Change-Id: I7144eeb908ede25358a3c8186198ac532de4d9f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166931
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
Stephan Bergmann 2024-04-30 16:51:21 +02:00
parent 79b1a61303
commit a3d758d528
5 changed files with 13 additions and 4 deletions

View file

@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_use_api,drawinglayer_processors,\
$(eval $(call gb_CppunitTest_use_libraries,drawinglayer_processors, \ $(eval $(call gb_CppunitTest_use_libraries,drawinglayer_processors, \
basegfx \ basegfx \
cppcanvas \ $(if $(ENABLE_WASM_STRIP_CANVAS),,cppcanvas) \
cppu \ cppu \
cppuhelper \ cppuhelper \
sal \ sal \

View file

@ -9,6 +9,9 @@
ifneq ($(CROSS_COMPILING),) ifneq ($(CROSS_COMPILING),)
gb_Module_add_targets_for_build := gb_Module_add_targets_for_build :=
endif
ifeq ($(gb_CAN_EXECUTE_HOST_CODE),$(false))
gb_Module_SKIPTARGETS := check coverage slowcheck screenshot subsequentcheck uicheck gb_Module_SKIPTARGETS := check coverage slowcheck screenshot subsequentcheck uicheck
endif endif

View file

@ -166,6 +166,14 @@ ifneq ($(strip $(ENVCFLAGSCXX)),)
gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX) gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
endif endif
ifeq ($(CROSS_COMPILING),)
gb_CAN_EXECUTE_HOST_CODE := $(true)
else ifeq ($(OS),EMSCRIPTEN)
gb_CAN_EXECUTE_HOST_CODE := $(true)
else
gb_CAN_EXECUTE_HOST_CODE := $(false)
endif
include $(GBUILDDIR)/ExternalExecutable.mk include $(GBUILDDIR)/ExternalExecutable.mk
include $(GBUILDDIR)/TargetLocations.mk include $(GBUILDDIR)/TargetLocations.mk

View file

@ -92,8 +92,6 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
endef endef
gb_SUPPRESS_TESTS := $(true)
define gb_Library_get_rpath define gb_Library_get_rpath
endef endef

View file

@ -30,7 +30,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_epubexport, \
)) ))
$(eval $(call gb_CppunitTest_use_externals,writerperfect_epubexport,\ $(eval $(call gb_CppunitTest_use_externals,writerperfect_epubexport,\
epubgen \ $(if $(ENABLE_WASM_STRIP_EPUB),,epubgen) \
libxml2 \ libxml2 \
revenge \ revenge \
)) ))