[Libreoffice-commits] .: Branch 'integration/dev300_m101' - desktop/test

[Kohei Yoshida]

 desktop/test/deployment/active/makefile.mk  |    4 ++++
 desktop/test/deployment/passive/makefile.mk |    5 +++++
 2 files changed, 9 insertions(+)

New commits:
commit d53f88ca2dc7d74eeffb91fc70490d99ae390d62
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Mar 15 23:02:07 2011 -0400

    Skip some tests that require Java when --without-java.
    
    However, this also skips tests for python...  Something to look into
    to fix later.

diff --git a/desktop/test/deployment/active/makefile.mk b/desktop/test/deployment/active/makefile.mk
index 5511a39..05c19eb 100755
--- a/desktop/test/deployment/active/makefile.mk
+++ b/desktop/test/deployment/active/makefile.mk
@@ -50,6 +50,8 @@ DEF1NAME = $(SHL1TARGET)
 
 .INCLUDE: target.mk
 
+.IF "$(SOLAR_JAVA)" != ""
+
 ALLTAR : $(MISC)/active.oxt
 
 $(MISC)/active.oxt : manifest.xml description.xml Addons.xcu \
@@ -81,3 +83,5 @@ $(MISC)/$(TARGET)/active_java.jar : MANIFEST.MF $(JAVATARGET)
         $(MISC)/$(TARGET)/active_java.jar-zip/$(PACKAGE)/
     cd $(MISC)/$(TARGET)/active_java.jar-zip && zip ../active_java.jar \
         META-INF/MANIFEST.MF $(foreach,i,$(JAVAFILES:b) $(PACKAGE)/$i.class)
+
+.ENDIF
diff --git a/desktop/test/deployment/passive/makefile.mk b/desktop/test/deployment/passive/makefile.mk
index 019e5dc..05defbe 100755
--- a/desktop/test/deployment/passive/makefile.mk
+++ b/desktop/test/deployment/passive/makefile.mk
@@ -40,6 +40,7 @@ my_generic_components = passive_java passive_python
 
 .INCLUDE: settings.mk
 
+
 DLLPRE =
 
 SLOFILES = $(SHL1OBJS)
@@ -53,6 +54,8 @@ DEF1NAME = $(SHL1TARGET)
 
 .INCLUDE: target.mk
 
+.IF "$(SOLAR_JAVA)" != ""
+
 ALLTAR : $(MISC)/passive.oxt
 
 $(MISC)/passive.oxt : manifest.xml description.xml Addons.xcu \
@@ -134,3 +137,5 @@ $(MISC)/$(TARGET)/passive_java.jar : MANIFEST.MF $(JAVATARGET)
         $(MISC)/$(TARGET)/passive_java.jar-zip/$(PACKAGE)/
     cd $(MISC)/$(TARGET)/passive_java.jar-zip && zip ../passive_java.jar \
         META-INF/MANIFEST.MF $(foreach,i,$(JAVAFILES:b) $(PACKAGE)/$i.class)
+
+.ENDIF