diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-15 23:02:07 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-15 23:03:17 -0400 |
| commit | a45a39c72d873967752267c8c9563800420aa7ef (patch) | |
| tree | 2b977edd3011559348b9194ab2631a11076e31ec /desktop/test/deployment/active | |
| parent | 575045fdbfec2b072fcde338958ee85d55ae69b2 (diff) | |
Skip some tests that require Java when --without-java.
However, this also skips tests for python... Something to look into
to fix later.
Diffstat (limited to 'desktop/test/deployment/active')
| -rwxr-xr-x | desktop/test/deployment/active/makefile.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/desktop/test/deployment/active/makefile.mk b/desktop/test/deployment/active/makefile.mk index 5511a39c8baf..05c19eb236e3 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 |