diff options
author | Thorsten Behrens <tbehrens@suse.com> | 2012-01-24 23:19:22 +0100 |
---|---|---|
committer | Thorsten Behrens <tbehrens@suse.com> | 2012-01-24 23:20:01 +0100 |
commit | efc28fae8d9453ff313f363d28e5a94ccd3adc4a (patch) | |
tree | 6559cf3e1db4e816ccebb873a9b58b7e006b9e35 /sd | |
parent | e5e0aae1e220cdde7b06c899425dcabd912048d1 (diff) |
Disable svg font embedding for sd filters test, enable again.
Diffstat (limited to 'sd')
-rw-r--r-- | sd/CppunitTest_sd_filters_test.mk | 2 | ||||
-rw-r--r-- | sd/Module_sd.mk | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index b4de440d40b6..5b89b8f3206a 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -123,7 +123,7 @@ $(eval $(call gb_CppunitTest_add_old_components,sd_filters_test,\ $(eval $(call gb_CppunitTest_set_args,sd_filters_test,\ --headless \ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ - "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \ + "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) -env:SVG_DISABLE_FONT_EMBEDDING=YEAH module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index f015d0439c1e..edc6f25bef33 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -52,18 +52,7 @@ endif $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\ JunitTest_sd_unoapi \ + CppunitTest_sd_regression_test \ )) -#TODO: Disabled for now, needs work by Thorsten Behrens to get "don't embed font -# config" taken into account, otherwise leads to failures like -# regression-test.cxx:84:Assertion -# Test name: SdFiltersTest::test -# assertion failed -# - Expression: false -# - Mismatch between reference file and exported file in line 60. -# Expected: <font-face font-family="StarSymbol embedded" units-per-em="2048" -# font-weight="normal" font-style="normal" ascent="1693" descent="318"/> -# Found : <font-face font-family="StarSymbol embedded" units-per-em="2048" -# font-weight="normal" font-style="normal" ascent="1640" descent="397"/> -# CppunitTest_sd_regression_test \ # vim: set noet sw=4 ts=4: |