diff options
| author | Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de> | 2019-12-06 14:46:44 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-12-16 12:58:35 +0100 |
| commit | 1fc85d03c46cedda136986fd6df7fe862893414b (patch) | |
| tree | 493299bdb73b92fcbede4696eb03feb4643941b3 /solenv/gbuild/UITest.mk | |
| parent | bac7e3cf4f4129616439220271009f0baaee5078 (diff) | |
Revert "Make font-based unit test depend on instdir fonts"
The following build:
$ make clean && make gb_CppunitTest_sc_ucalc
[...]
$ cd sc
$ make gb_CppunitTest_sc_ucalc
triggers:
sc/CppunitTest_sc_subsequent_filters_test.mk:133:
*** Missing font filelist -> run make more_fonts extras.
This didn't help the general Win32 font build problem AFAIK. There
were additional patches to the way Windows loads the LO provided
fonts, so just revert this.
This reverts commit 368c996b24e09c427a30972b3405493328db6779.
Change-Id: I841f96fe8312c47980c8e3be2e9d88242df5b28d
Reviewed-on: https://gerrit.libreoffice.org/84633
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv/gbuild/UITest.mk')
| -rw-r--r-- | solenv/gbuild/UITest.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk index c155348194ca..d558edbc034f 100644 --- a/solenv/gbuild/UITest.mk +++ b/solenv/gbuild/UITest.mk @@ -96,7 +96,7 @@ $(call gb_UITest_get_target,$(1)) : PYPATH := $(SRCDIR)/uitest$$(gb_CLASSPATHSEP $(call gb_UITest_get_target,$(1)) : MODULES := $(eval $(call gb_TestHelpers_use_more_fonts,$(call gb_UITest_get_target,$(1)))) -$(eval $(call gb_Module_register_target,UITest_$(1),$(call gb_UITest_get_target,$(1)),$(call gb_UITest_get_clean_target,$(1)))) +$(eval $(call gb_Module_register_target,$(call gb_UITest_get_target,$(1)),$(call gb_UITest_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),UITest) endef @@ -138,7 +138,7 @@ endif @true define gb_UITest_UITest -$(eval $(call gb_Module_register_target,UITest_$(1),$(call gb_UITest_get_target,$(1)),$(call gb_UITest_get_clean_target,$(1)))) +$(eval $(call gb_Module_register_target,$(call gb_UITest_get_target,$(1)),$(call gb_UITest_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),UITest) endef |