From 526f8f9a9caa29d8687c8bddb20a60994a8d67ce Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <b_michaelsen@openoffice.org>
Date: Wed, 19 Jan 2011 14:16:46 +0100
Subject: [PATCH] gnumake3: #i116390# finishing support for Junittests in
 gbuild

---
 framework/JunitTest_framework_complex.mk | 8 ++++++++
 framework/JunitTest_framework_unoapi.mk  | 8 ++++++++
 sfx2/JunitTest_sfx2_complex.mk           | 8 ++++++++
 xmloff/JunitTest_xmloff_unoapi.mk        | 8 ++++++++
 4 files changed, 32 insertions(+)

diff --git a/framework/JunitTest_framework_complex.mk b/framework/JunitTest_framework_complex.mk
index 037486d13bfa..65a2d749e8ac 100755
--- a/framework/JunitTest_framework_complex.mk
+++ b/framework/JunitTest_framework_complex.mk
@@ -32,6 +32,14 @@ $(eval $(call gb_JunitTest_set_defs,framework_complex,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/complex/broken_document/test_documents \
 ))
 
+$(eval $(call gb_JunitTest_add_jars,framework_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,framework_complex,\
     framework/qa/complex/disposing/GetServiceWhileDisposingOffice \
     framework/qa/complex/path_substitution/PathSubstitutionTest \
diff --git a/framework/JunitTest_framework_unoapi.mk b/framework/JunitTest_framework_unoapi.mk
index 0ccb2df8d7cb..1204ee5262c9 100755
--- a/framework/JunitTest_framework_unoapi.mk
+++ b/framework/JunitTest_framework_unoapi.mk
@@ -34,6 +34,14 @@ $(eval $(call gb_JunitTest_set_defs,framework_unoapi,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/unoapi/testdocuments \
 ))
 
+$(eval $(call gb_JunitTest_add_jars,framework_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,framework_unoapi,\
     framework/qa/unoapi/Test \
 ))
diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
index ab8c90e47347..fbb1e11d8c8c 100755
--- a/sfx2/JunitTest_sfx2_complex.mk
+++ b/sfx2/JunitTest_sfx2_complex.mk
@@ -32,6 +32,14 @@ $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/complex/framework/testdocuments \
 ))
 
+$(eval $(call gb_JunitTest_add_jars,sfx2_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,sfx2_complex,\
     sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1 \
     sfx2/qa/complex/framework/DocumentMetadataAccessTest \
diff --git a/xmloff/JunitTest_xmloff_unoapi.mk b/xmloff/JunitTest_xmloff_unoapi.mk
index 78cd23137410..8ac3a5aedfd3 100755
--- a/xmloff/JunitTest_xmloff_unoapi.mk
+++ b/xmloff/JunitTest_xmloff_unoapi.mk
@@ -34,6 +34,14 @@ $(eval $(call gb_JunitTest_set_defs,xmloff_unoapi,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/xmloff/qa/unoapi/testdocuments \
 ))
 
+$(eval $(call gb_JunitTest_add_jars,xmloff_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,xmloff_unoapi,\
     xmloff/qa/unoapi/Test \
 ))