diff options
author | sb <sb@openoffice.org> | 2010-02-12 21:44:58 +0100 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-02-12 21:44:58 +0100 |
commit | b4bcff765d0d48b2fe2cc1854d31f076f75d3671 (patch) | |
tree | ef20c9b4645f5bad1c6e6236db06d67cb8dd2310 /solenv/inc/installationtest.mk | |
parent | sb118: moved test OOo installation stuff to new solenv/inc/installationtest.m... (diff) | |
download | core-b4bcff765d0d48b2fe2cc1854d31f076f75d3671.tar.gz core-b4bcff765d0d48b2fe2cc1854d31f076f75d3671.zip |
sb118: introduced JAVAIFLAGS so that Java interpreter matches OOo jnilibs
Diffstat (limited to 'solenv/inc/installationtest.mk')
-rw-r--r-- | solenv/inc/installationtest.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 29660f18c971..33c0b493c2db 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -106,7 +106,8 @@ $(MISC)/$(TARGET)/services.rdb : javatest .PHONY : $(MISC)/$(TARGET)/installation.flag $(JAVATARGET) $(RM) -r $(MISC)/$(TARGET)/user $(MKDIR) $(MISC)/$(TARGET)/user - $(JAVAI) $(JAVACPS) $(OOO_JUNIT_JAR)$(PATH_SEPARATOR)$(CLASSPATH) \ + $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ + $(OOO_JUNIT_JAR)$(PATH_SEPARATOR)$(CLASSPATH) \ -Dorg.openoffice.test.arg.path=$(my_soffice) \ -Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \ $(my_javaenv) org.junit.runner.JUnitCore \ |