diff options
Diffstat (limited to 'bridges/test')
| -rw-r--r-- | bridges/test/java_uno/acquire/makefile.mk | 10 | ||||
| -rw-r--r-- | bridges/test/java_uno/any/makefile.mk | 10 | ||||
| -rw-r--r-- | bridges/test/java_uno/equals/makefile.mk | 8 | ||||
| -rw-r--r-- | bridges/test/java_uno/nativethreadpool/makefile.mk | 4 |
4 files changed, 16 insertions, 16 deletions
diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk index 837371076507..e38f9e8fa20e 100644 --- a/bridges/test/java_uno/acquire/makefile.mk +++ b/bridges/test/java_uno/acquire/makefile.mk @@ -56,7 +56,7 @@ GIVE_EXEC_RIGHTS = chmod +x EXEC_CLASSPATH_TMP = $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i) EXEC_CLASSPATH = \ - $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) + $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) $(BIN)$/$(TARGET).rdb: types.idl - rm $@ @@ -79,16 +79,16 @@ TEST_JAVAUNO_ACQUIRE_UNO_URL := \ $(BIN)$/testacquire-java-client: echo java -classpath \ - ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)\ -..$/class$/java_uno.jar$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \ + ..$/class$/test$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)\ +..$/class$/java_uno.jar$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \ test.javauno.acquire.TestAcquire client \ $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@ $(GIVE_EXEC_RIGHTS) $@ $(BIN)$/testacquire-java-server: echo java -classpath \ - ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)\ -..$/class$/java_uno.jar$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \ + ..$/class$/test$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)\ +..$/class$/java_uno.jar$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \ test.javauno.acquire.TestAcquire server \ $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@ $(GIVE_EXEC_RIGHTS) $@ diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk index e9975408ed46..b942e546ff69 100644 --- a/bridges/test/java_uno/any/makefile.mk +++ b/bridges/test/java_uno/any/makefile.mk @@ -39,13 +39,13 @@ JAVAFILES = \ .IF "$(XCLASSPATH)" == "" XCLASSPATH := $(CLASSDIR)$/test .ELSE -XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPARATOR)$(CLASSDIR)$/test +XCLASSPATH !:= $(XCLASSPATH)$(LIBO_PATH_SEPARATOR)$(CLASSDIR)$/test .ENDIF EXEC_CLASSPATH_TMP = \ - $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(PATH_SEPARATOR)$(XCLASSPATH) + $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(LIBO_PATH_SEPARATOR)$(XCLASSPATH) EXEC_CLASSPATH = \ - $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) + $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) JARFILES = juh.jar jurt.jar ridl.jar JAVACLASSFILES = \ @@ -96,14 +96,14 @@ ALLTAR : \ $(OUT)$/bin$/TestRemote : $(JAVACLASSFILES) -rm -f $@ - echo java -classpath ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \ + echo java -classpath ..$/class$/test$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \ test.java_uno.anytest.TestRemote > $@ $(GIVE_EXEC_RIGHTS) $@ $(OUT)$/bin$/TestJni : $(JAVACLASSFILES) -rm -f $@ echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \ - .$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \ + .$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \ -Djava.library.path=..$/lib test.java_uno.anytest.TestJni >> $@ $(GIVE_EXEC_RIGHTS) $@ diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk index ae700d48c8b1..e6affc874683 100644 --- a/bridges/test/java_uno/equals/makefile.mk +++ b/bridges/test/java_uno/equals/makefile.mk @@ -30,7 +30,7 @@ ENABLE_EXCEPTIONS = TRUE .IF "$(XCLASSPATH)" == "" XCLASSPATH := $(CLASSDIR)$/test .ELSE -XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPARATOR)$(CLASSDIR)$/test +XCLASSPATH !:= $(XCLASSPATH)$(LIBO_PATH_SEPARATOR)$(CLASSDIR)$/test .ENDIF DLLPRE = # no leading "lib" on .so files @@ -59,7 +59,7 @@ GIVE_EXEC_RIGHTS = chmod +x EXEC_CLASSPATH_TMP = $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i) EXEC_CLASSPATH = \ - $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) + $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) $(MISC)$/$(TARGET).rdb: types.idl - rm $@ @@ -74,8 +74,8 @@ $(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).rdb $(BIN)$/testequals: $(BIN)$/testequals_services.rdb echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \ - ..$/class$/test$(PATH_SEPARATOR)..$/class$(PATH_SEPARATOR)\ -..$/class$/java_uno.jar$(PATH_SEPARATOR)$(EXEC_CLASSPATH) \ + ..$/class$/test$(LIBO_PATH_SEPARATOR)..$/class$(LIBO_PATH_SEPARATOR)\ +..$/class$/java_uno.jar$(LIBO_PATH_SEPARATOR)$(EXEC_CLASSPATH) \ test.java_uno.equals.TestEquals $(SOLARBINDIR)$/types.rdb \ testequals_services.rdb > $@ $(GIVE_EXEC_RIGHTS) $@ diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk index dc485622e60d..504bcb1ac2cc 100644 --- a/bridges/test/java_uno/nativethreadpool/makefile.mk +++ b/bridges/test/java_uno/nativethreadpool/makefile.mk @@ -59,7 +59,7 @@ ALLTAR: test EXEC_CLASSPATH_TMP = $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i) EXEC_CLASSPATH = \ - $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) + $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) $(MISC)$/$(TARGET)$/types.rdb: types.idl - rm $@ @@ -105,7 +105,7 @@ test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).uno.jar $(BIN)$/$(TARGET).rdb -l $(SHL2TARGETN) -ro $(BIN)$/$(TARGET).rdb \ -u 'uno:socket,host=localhost,port=3830;urp;test' --singleaccept & + $(AUGMENT_LIBRARY_PATH) OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' \ - CLASSPATH=$(EXEC_CLASSPATH)$(PATH_SEPARATOR)$(BIN)$/$(TARGET).uno.jar \ + CLASSPATH=$(EXEC_CLASSPATH)$(LIBO_PATH_SEPARATOR)$(BIN)$/$(TARGET).uno.jar \ uno -c test.javauno.nativethreadpool.client -l $(SHL1TARGETN) \ -ro $(BIN)$/$(TARGET).rdb \ -env:URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR) |