diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-20 08:16:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-20 08:16:09 +0000 |
| commit | c5beb2e2693122edfb99426fe93b7272fcec7a52 (patch) | |
| tree | bb18c0d47a7bcc7411cbd5a27d264e8652fc2667 /testtools | |
| parent | 51abd6ec27c17c344021da4ed9ea0d6439ea8a11 (diff) | |
INTEGRATION: CWS sb21 (1.16.2); FILE MERGED
2004/08/04 15:24:38 sb 1.16.2.1: #i32281# Use 127.0.0.1 instead of localhost to work around IPv4 vs. IPv6 problems between Java and osl.
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index 9187bc3e5c31..40a772bdf775 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: rt $ $Date: 2004-07-23 14:47:41 $ +# last change: $Author: rt $ $Date: 2004-08-20 09:16:09 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -192,11 +192,12 @@ MY_JARS=java_uno.jar ridl.jar jurt.jar juh.jar MY_CLASSPATH_TMP=$(foreach,i,$(MY_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(XCLASSPATH) MY_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))$(PATH_SEPERATOR)..$/class +# Use "127.0.0.1" instead of "localhost", see #i32281#: $(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk -rm -f $@ +echo java -classpath $(MY_CLASSPATH)$(PATH_SEPERATOR)..$/class$/testComponent.jar \ com.sun.star.comp.bridge.TestComponentMain \ - \""uno:socket,host=localhost,port=2002;urp;test"\" \ + \""uno:socket,host=127.0.0.1,port=2002;urp;test"\" \ > $@ $(GIVE_EXEC_RIGHTS) $@ |