openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1755631 - in /openoffice/trunk/main: dbaccess/ editeng/ linguistic/ reportdesign/ starmath/ unotools/ vbahelper/ writerfilter/
Date Tue, 09 Aug 2016 16:38:28 GMT
Author: damjan
Date: Tue Aug  9 16:38:27 2016
New Revision: 1755631

URL: http://svn.apache.org/viewvc?rev=1755631&view=rev
Log:
Only enable subsequent checks if JUnit is available.

Patch by: me


Modified:
    openoffice/trunk/main/dbaccess/Module_dbaccess.mk
    openoffice/trunk/main/editeng/Module_editeng.mk
    openoffice/trunk/main/linguistic/Module_linguistic.mk
    openoffice/trunk/main/reportdesign/Module_reportdesign.mk
    openoffice/trunk/main/starmath/Module_starmath.mk
    openoffice/trunk/main/unotools/Module_unotools.mk
    openoffice/trunk/main/vbahelper/Module_vbahelper.mk
    openoffice/trunk/main/writerfilter/Module_writerfilter.mk

Modified: openoffice/trunk/main/dbaccess/Module_dbaccess.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/Module_dbaccess.mk?rev=1755631&r1=1755630&r2=1755631&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/Module_dbaccess.mk (original)
+++ openoffice/trunk/main/dbaccess/Module_dbaccess.mk Tue Aug  9 16:38:27 2016
@@ -46,9 +46,11 @@ $(eval $(call gb_Module_add_targets,dbac
 ))
 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:

Modified: openoffice/trunk/main/editeng/Module_editeng.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/Module_editeng.mk?rev=1755631&r1=1755630&r2=1755631&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/Module_editeng.mk (original)
+++ openoffice/trunk/main/editeng/Module_editeng.mk Tue Aug  9 16:38:27 2016
@@ -35,7 +35,9 @@ $(eval $(call gb_Module_add_check_target
 ))
 
 # 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:

Modified: openoffice/trunk/main/linguistic/Module_linguistic.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/linguistic/Module_linguistic.mk?rev=1755631&r1=1755630&r2=1755631&view=diff
==============================================================================
--- openoffice/trunk/main/linguistic/Module_linguistic.mk (original)
+++ openoffice/trunk/main/linguistic/Module_linguistic.mk Tue Aug  9 16:38:27 2016
@@ -31,9 +31,11 @@ $(eval $(call gb_Module_add_targets,ling
 #$(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 \

Modified: openoffice/trunk/main/reportdesign/Module_reportdesign.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/Module_reportdesign.mk?rev=1755631&r1=1755630&r2=1755631&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/Module_reportdesign.mk (original)
+++ openoffice/trunk/main/reportdesign/Module_reportdesign.mk Tue Aug  9 16:38:27 2016
@@ -33,10 +33,12 @@ $(eval $(call gb_Module_add_targets,repo
 	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:

Modified: openoffice/trunk/main/starmath/Module_starmath.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/starmath/Module_starmath.mk?rev=1755631&r1=1755630&r2=1755631&view=diff
==============================================================================
--- openoffice/trunk/main/starmath/Module_starmath.mk (original)
+++ openoffice/trunk/main/starmath/Module_starmath.mk Tue Aug  9 16:38:27 2016
@@ -30,8 +30,10 @@ $(eval $(call gb_Module_add_targets,star
 	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:

Modified: openoffice/trunk/main/unotools/Module_unotools.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unotools/Module_unotools.mk?rev=1755631&r1=1755630&r2=1755631&view=diff
==============================================================================
--- openoffice/trunk/main/unotools/Module_unotools.mk (original)
+++ openoffice/trunk/main/unotools/Module_unotools.mk Tue Aug  9 16:38:27 2016
@@ -28,8 +28,10 @@ $(eval $(call gb_Module_add_targets,unot
 	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:

Modified: openoffice/trunk/main/vbahelper/Module_vbahelper.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vbahelper/Module_vbahelper.mk?rev=1755631&r1=1755630&r2=1755631&view=diff
==============================================================================
--- openoffice/trunk/main/vbahelper/Module_vbahelper.mk (original)
+++ openoffice/trunk/main/vbahelper/Module_vbahelper.mk Tue Aug  9 16:38:27 2016
@@ -36,7 +36,9 @@ $(eval $(call gb_Module_add_targets,vbah
 #))
 
 # 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:

Modified: openoffice/trunk/main/writerfilter/Module_writerfilter.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/Module_writerfilter.mk?rev=1755631&r1=1755630&r2=1755631&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/Module_writerfilter.mk (original)
+++ openoffice/trunk/main/writerfilter/Module_writerfilter.mk Tue Aug  9 16:38:27 2016
@@ -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:



Mime
View raw message