summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <b_michaelsen@openoffice.org>2011-01-19 14:16:46 +0100
committerBjoern Michaelsen <b_michaelsen@openoffice.org>2011-01-19 14:16:46 +0100
commitc78a063da4e10dead484f9065fe7ba731f123be3 (patch)
tree372622ba624faec642fdf2b142a50d978e754ec5
parentfe6d1ac402b301fd2b15c202d153fe9f8b7494db (diff)
gnumake3: #i116390# finishing support for Junittests in gbuild
-rwxr-xr-xsvl/JunitTest_svl_complex.mk8
-rwxr-xr-xsvtools/JunitTest_svtools_unoapi.mk8
-rwxr-xr-xtoolkit/JunitTest_toolkit_unoapi.mk8
3 files changed, 24 insertions, 0 deletions
diff --git a/svl/JunitTest_svl_complex.mk b/svl/JunitTest_svl_complex.mk
index bab6ec14d0f5..8c82e3472b9e 100755
--- a/svl/JunitTest_svl_complex.mk
+++ b/svl/JunitTest_svl_complex.mk
@@ -32,6 +32,14 @@ $(eval $(call gb_JunitTest_set_defs,svl_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svl/qa/complex/broken_document/test_documents \
))
+$(eval $(call gb_JunitTest_add_jars,svl_complex,\
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+))
+
$(eval $(call gb_JunitTest_add_sourcefiles,svl_complex,\
svl/qa/complex/ConfigItems/CheckConfigItems \
svl/qa/complex/passwordcontainer/PasswordContainerUnitTest \
diff --git a/svtools/JunitTest_svtools_unoapi.mk b/svtools/JunitTest_svtools_unoapi.mk
index a30157845376..baaefc84c5be 100755
--- a/svtools/JunitTest_svtools_unoapi.mk
+++ b/svtools/JunitTest_svtools_unoapi.mk
@@ -34,6 +34,14 @@ $(eval $(call gb_JunitTest_set_defs,svtools_unoapi,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svtools/qa/unoapi/testdocuments \
))
+$(eval $(call gb_JunitTest_add_jars,svtools_unoapi,\
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+))
+
$(eval $(call gb_JunitTest_add_sourcefiles,svtools_unoapi,\
svtools/qa/unoapi/Test \
))
diff --git a/toolkit/JunitTest_toolkit_unoapi.mk b/toolkit/JunitTest_toolkit_unoapi.mk
index b111bdbc3e9a..27dc89e13478 100755
--- a/toolkit/JunitTest_toolkit_unoapi.mk
+++ b/toolkit/JunitTest_toolkit_unoapi.mk
@@ -34,6 +34,14 @@ $(eval $(call gb_JunitTest_set_defs,toolkit_unoapi,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/toolkit/qa/unoapi/testdocuments \
))
+$(eval $(call gb_JunitTest_add_jars,toolkit_unoapi,\
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+))
+
$(eval $(call gb_JunitTest_add_sourcefiles,toolkit_unoapi,\
toolkit/qa/unoapi/Test \
))