diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:16 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:16 +0200 |
commit | 6e135ba19ae197fa6b1ca65034ad3dc8876a6be0 (patch) | |
tree | a33121f11b40eab2724736c768b487cfc3811913 /writerfilter/JunitTest_writerfilter_complex.mk | |
parent | 96d563c01bcb8d5126a447276d04058075dd25ea (diff) |
fixing rebase errors
Diffstat (limited to 'writerfilter/JunitTest_writerfilter_complex.mk')
-rw-r--r-- | writerfilter/JunitTest_writerfilter_complex.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk index 860720041395..5262f0a0fc43 100644 --- a/writerfilter/JunitTest_writerfilter_complex.mk +++ b/writerfilter/JunitTest_writerfilter_complex.mk @@ -27,7 +27,8 @@ $(eval $(call gb_JunitTest_JunitTest,writerfilter_complex,SRCDIR)) -$(eval $(call gb_JunitTest_add_defs,writerfilter_complex,\ +$(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\ + $$(DEFS) \ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/complex/ooxml/testdocuments \ )) |