summaryrefslogtreecommitdiff
path: root/bridges/test
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-28 18:00:14 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-28 18:00:14 +0000
commit50f9ae5a90c6a73890c9c4b12aedf90fa48b8bcf (patch)
tree09a5ab58eb894d3ccb7ea711626513fab27f9c41 /bridges/test
parentce6b62881d7aa295c3dc715e9a61e9a0e700aefd (diff)
CWS-TOOLING: integrate CWS sb109
2009-04-21 13:42:45 +0200 sb r271035 : removed obsolete psprint dependency 2009-04-21 10:33:31 +0200 sb r271024 : changes to previous -c270971 so that build does not break for USE_SHELL!=bash (but instead resulting bridgetest_xxx scripts are nonfunctional) 2009-04-21 08:56:48 +0200 sb r271017 : merged in cws/sb107 -c 268250 (avoid warnings about format specifier and argument mismatch (on 64bit debug builds)) 2009-04-20 16:42:27 +0200 sb r270995 : #i98625# add make_xxx functions for C++ representations of UNO polystructs; fixed and adapted tests (patch by thb, slightly adapted) 2009-04-20 14:23:45 +0200 sb r270981 : #i84751# selective performance improvements (patch by mmeeks, slightly adapted) 2009-04-20 13:39:50 +0200 sb r270978 : #i99711# removed dead code (patch by cmc, slightly modified) 2009-04-20 11:59:39 +0200 sb r270972 : #i97975# avoid crashes during shutdown (patch by cmc, slightly modified) 2009-04-20 11:57:52 +0200 sb r270971 : made tests work again after LD_LIBRARY_PATH clean up 2009-04-20 09:49:32 +0200 sb r270963 : #i95593# made tests work again after LD_LIBRARY_PATH cleanup 2009-04-17 13:52:33 +0200 sb r270941 : merged in cws/sb107 -c 270023 (added svn:ignore) 2009-04-15 13:46:24 +0200 sb r270841 : #i92131# dead code elimination (based on a patch by cmc) 2009-04-15 13:29:27 +0200 sb r270839 : #i100743# use a FastLess for the Data map (based on a patch my mmeeks) 2009-04-15 13:12:11 +0200 sb r270837 : #i100583# dead code elimination (patch by cmc) 2009-04-15 13:02:19 +0200 sb r270835 : avoid bogus Solaris C++ compiler warning when building with debug=x 2009-04-15 11:49:46 +0200 sb r270828 : adapted to cleared LD_LIBRARY_PATH 2009-04-15 10:49:48 +0200 sb r270826 : #i101101# for performance reasons, do not put ComponentContext in unsafe appartment 2009-04-15 10:08:20 +0200 sb r270824 : #i99113# removed duplicated stocservices.uno lib from basis layer
Diffstat (limited to 'bridges/test')
-rw-r--r--bridges/test/java_uno/acquire/makefile.mk12
-rw-r--r--bridges/test/java_uno/any/makefile.mk2
-rw-r--r--bridges/test/java_uno/equals/TestEquals.java3
-rw-r--r--bridges/test/java_uno/equals/makefile.mk2
-rw-r--r--bridges/test/java_uno/nativethreadpool/makefile.mk15
-rw-r--r--bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx4
-rw-r--r--bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx4
7 files changed, 25 insertions, 17 deletions
diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk
index c9f04f503180..d027c067dad7 100644
--- a/bridges/test/java_uno/acquire/makefile.mk
+++ b/bridges/test/java_uno/acquire/makefile.mk
@@ -107,11 +107,15 @@ $(BIN)$/testacquire-java-server$(SCRIPTEXT):
$(GIVE_EXEC_RIGHTS) $@
$(BIN)$/testacquire-native-client$(SCRIPTEXT):
- echo uno -c com.sun.star.test.bridges.testacquire.impl -l $(SHL1TARGETN:f) \
- -ro $(TARGET).rdb -- $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
+ echo '$(AUGMENT_LIBRARY_PATH)' uno \
+ -c com.sun.star.test.bridges.testacquire.impl \
+ -l ../lib/$(SHL1TARGETN:f) -ro $(TARGET).rdb -- \
+ $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
$(GIVE_EXEC_RIGHTS) $@
$(BIN)$/testacquire-native-server$(SCRIPTEXT):
- echo uno -c com.sun.star.test.bridges.testacquire.impl -l $(SHL1TARGETN:f) \
- -ro $(TARGET).rdb -u $(TEST_JAVAUNO_ACQUIRE_UNO_URL) --singleaccept > $@
+ echo '$(AUGMENT_LIBRARY_PATH)' uno \
+ -c com.sun.star.test.bridges.testacquire.impl \
+ -l ../lib/$(SHL1TARGETN:f) -ro $(TARGET).rdb \
+ -u $(TEST_JAVAUNO_ACQUIRE_UNO_URL) --singleaccept > $@
$(GIVE_EXEC_RIGHTS) $@
diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk
index d02c5fc4d93c..1957194f856a 100644
--- a/bridges/test/java_uno/any/makefile.mk
+++ b/bridges/test/java_uno/any/makefile.mk
@@ -115,7 +115,7 @@ $(OUT)$/bin$/TestRemote$(SCRIPTEXT) : $(JAVACLASSFILES)
$(OUT)$/bin$/TestJni$(SCRIPTEXT) : $(JAVACLASSFILES)
-rm -f $@
- echo java -classpath \
+ echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
.$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
-Djava.library.path=..$/lib test.java_uno.anytest.TestJni >> $@
$(GIVE_EXEC_RIGHTS) $@
diff --git a/bridges/test/java_uno/equals/TestEquals.java b/bridges/test/java_uno/equals/TestEquals.java
index 8cd0c8049ad9..31b735473c9b 100644
--- a/bridges/test/java_uno/equals/TestEquals.java
+++ b/bridges/test/java_uno/equals/TestEquals.java
@@ -197,7 +197,8 @@ public final class TestEquals {
loader.activate(
"com.sun.star.test.bridges."
+ "testequals.impl",
- "", "testequals.uno", null));
+ "", "../lib/testequals.uno",
+ null));
XTestInterface test = (XTestInterface)
UnoRuntime.queryInterface(
XTestInterface.class,
diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk
index 787da9a88370..4064b5e48f09 100644
--- a/bridges/test/java_uno/equals/makefile.mk
+++ b/bridges/test/java_uno/equals/makefile.mk
@@ -86,7 +86,7 @@ $(MISC)$/$(TARGET).rdb: types.idl
$(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).rdb
$(BIN)$/testequals$(SCRIPTEXT): $(BIN)$/testequals_services.rdb
- echo java -classpath \
+ echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
test.java_uno.equals.TestEquals $(SOLARBINDIR)$/types.rdb \
diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk
index 5eb7a8cb3a88..c8f7a778f051 100644
--- a/bridges/test/java_uno/nativethreadpool/makefile.mk
+++ b/bridges/test/java_uno/nativethreadpool/makefile.mk
@@ -101,25 +101,24 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
$(REGCOMP) -register -r $(MISC)$/$(TARGET)$/bootstrap.rdb \
-c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \
-c stocservices.uno$(DLLPOST)
-.IF "$(GUI)" == "WNT"
+.IF "$(GUI)" == "WNT" || "$(USE_SHELL)" != "bash"
ERROR -- missing platform
.ELSE # GUI, WNT
- + setenv OO_JAVA_PROPERTIES RuntimeLib=$(JVM_LIB_URL) ; \
+ + export OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' && \
$(REGCOMP) -register -r $@ -c file://$(PWD)/$(BIN)$/$(TARGET).uno.jar \
-br $(MISC)$/$(TARGET)$/bootstrap.rdb -classpath $(EXEC_CLASSPATH) \
-env:URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR)
.ENDIF # GUI, WNT
test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).uno.jar $(BIN)$/$(TARGET).rdb
-.IF "$(GUI)" == "WNT"
+.IF "$(GUI)" == "WNT" || "$(USE_SHELL)" != "bash"
ERROR -- missing platform
.ELSE # GUI, WNT
- uno -c test.javauno.nativethreadpool.server -l $(SHL2TARGETN) \
- -ro $(BIN)$/$(TARGET).rdb \
+ $(AUGMENT_LIBRARY_PATH) uno -c test.javauno.nativethreadpool.server \
+ -l $(SHL2TARGETN) -ro $(BIN)$/$(TARGET).rdb \
-u 'uno:socket,host=localhost,port=3830;urp;test' --singleaccept &
- + setenv OO_JAVA_PROPERTIES RuntimeLib=$(JVM_LIB_URL) ; \
- setenv CLASSPATH \
- $(EXEC_CLASSPATH)$(PATH_SEPERATOR)$(BIN)$/$(TARGET).uno.jar ; \
+ + $(AUGMENT_LIBRARY_PATH) OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' \
+ CLASSPATH=$(EXEC_CLASSPATH)$(PATH_SEPERATOR)$(BIN)$/$(TARGET).uno.jar \
uno -c test.javauno.nativethreadpool.client -l $(SHL1TARGETN) \
-ro $(BIN)$/$(TARGET).rdb \
-env:URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR)
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index b59f18f81e17..82bc6506a51f 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -167,7 +167,9 @@ css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
cppu::ImplementationEntry entries[] = {
{ &create, &getImplementationName, &getSupportedServiceNames,
- &cppu::createSingleComponentFactory, 0, 0 } };
+ &cppu::createSingleComponentFactory, 0, 0 },
+ { 0, 0, 0, 0, 0, 0 }
+};
}
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index fc01c0ffb7c3..bc52ec509c52 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -129,7 +129,9 @@ css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
cppu::ImplementationEntry entries[] = {
{ &create, &getImplementationName, &getSupportedServiceNames,
- &cppu::createSingleComponentFactory, 0, 0 } };
+ &cppu::createSingleComponentFactory, 0, 0 },
+ { 0, 0, 0, 0, 0, 0 }
+};
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 10:03:52 +0000