Only enable subsequent checks if JUnit is available.

Patch by: me

8 files changed, 16 insertions, 0 deletions

diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 3d8aabdc400d..e2c638d0690e 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -46,9 +46,11 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
 ))
 endif
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
 	JunitTest_dbaccess_complex \
 	JunitTest_dbaccess_unoapi \
 ))
+endif
 
 # vim: set noet ts=4 sw=4:
diff --git a/editeng/Module_editeng.mk b/editeng/Module_editeng.mk
index 69718a6058ea..6585ce24e704 100644
--- a/editeng/Module_editeng.mk
+++ b/editeng/Module_editeng.mk
@@ -35,7 +35,9 @@ $(eval $(call gb_Module_add_check_targets,editeng,\
 ))
 
 # add any subsequent checks (e.g. complex tests) here
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,editeng,\
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/linguistic/Module_linguistic.mk b/linguistic/Module_linguistic.mk
index ad6d98bdd0b0..90cf45c59250 100755
--- a/linguistic/Module_linguistic.mk
+++ b/linguistic/Module_linguistic.mk
@@ -31,9 +31,11 @@ $(eval $(call gb_Module_add_targets,linguistic,\
 #$(eval $(call gb_Module_add_check_targets,linguistic,\
 #))
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,linguistic,\
 	JunitTest_linguistic_unoapi \
 ))
+endif
 
 # was disabled in old build system
 # JunitTest_linguistic_complex \
diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk
index 7ed87ddedc1f..b49ebd086e17 100644
--- a/reportdesign/Module_reportdesign.mk
+++ b/reportdesign/Module_reportdesign.mk
@@ -33,10 +33,12 @@ $(eval $(call gb_Module_add_targets,reportdesign,\
 	Package_xml \
 ))
 
+ifneq ($(OOO_JUNIT_JAR),)
 # deactivated since sb123;
 # apparently fails because OOo does not find JVM?
 #$(eval $(call gb_Module_add_subsequentcheck_targets,reportdesign,\
 	JunitTest_reportdesign_complex \
 ))
+endif
 
 # vim: set noet ts=4 sw=4:
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index 20ab0a5287c9..b4ef24b4149f 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -30,8 +30,10 @@ $(eval $(call gb_Module_add_targets,starmath,\
 	Package_uiconfig \
 ))
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,starmath,\
 	JunitTest_sm_unoapi \
 ))
+endif
 
 # vim: set noet ts=4 sw=4:
diff --git a/unotools/Module_unotools.mk b/unotools/Module_unotools.mk
index 65a214a8b629..3693a3d03d1d 100644
--- a/unotools/Module_unotools.mk
+++ b/unotools/Module_unotools.mk
@@ -28,8 +28,10 @@ $(eval $(call gb_Module_add_targets,unotools,\
 	Package_inc \
 ))
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,unotools,\
 	JunitTest_unotools_complex  \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/vbahelper/Module_vbahelper.mk b/vbahelper/Module_vbahelper.mk
index 05e5a3fbf1e2..97975e8b17b7 100644
--- a/vbahelper/Module_vbahelper.mk
+++ b/vbahelper/Module_vbahelper.mk
@@ -36,7 +36,9 @@ $(eval $(call gb_Module_add_targets,vbahelper,\
 #))
 
 # add any subsequent checks (e.g. complex tests) here
+ifneq ($(OOO_JUNIT_JAR),)
 #$(eval $(call gb_Module_add_subsequentcheck_targets,vbahelper,\
 #))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
index 1b1ba00e7bff..f6ac9144d36a 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -36,8 +36,10 @@ ifeq ($(WITH_CPPUNIT),YES)
 #))
 endif
 
+ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,writerfilter,\
 	JunitTest_writerfilter_complex \
 ))
+endif
 
 # vim: set noet sw=4 ts=4: