.gitignore | 3 ---
testtools/CustomTarget_bridgetest.mk | 28 ++++++++++++++--------------
testtools/CustomTarget_uno_test.mk | 19 +++++++++----------
3 files changed, 23 insertions(+), 27 deletions(-)
New commits:
commit d15fbd21db2fa420f095ecd82dfedd5db393c2ea
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Dec 19 16:51:18 2012 +0100
No more .memdump files left behind by xstlproc in postprocess
...since e37eb6345dcc09620889a9b8622ea0b7b57da0e0 "postprocess: convert to
gbuild"
Change-Id: Ia7f29efebb2872e096d36ab04f5d13bc2d437d71
diff --git a/.gitignore b/.gitignore
index ae41aee..d068a57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,9 +102,6 @@ TAGS
# MSVC debug information
/*/vc90.pdb
-# libxslt debug memdump
-.memdump
-
# LibreOffice lock files
.~lock.*#
commit 3f141809c84c8ac9a56c3cbf8ac7e872e44a6e0f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Dec 19 16:48:37 2012 +0100
Make testtools use defaultBootstrap_InitialComponentContext
...instead of the ure executable's obsolte -ro arguments (leading to usage
of
deprecated bootstrap_InitialComponentContext with an XSimpleRegistry
instead),
similar to 0c1dc375b4bf0c8ff01fe51921767faa703b1295 "Make
ure/source/uretest/
use defaultBootstrap_InitialComponentContext."
Change-Id: Idd35e27959f7650decfe78364d86614bafbbbec7
diff --git a/testtools/CustomTarget_bridgetest.mk
b/testtools/CustomTarget_bridgetest.mk
index c30ac3d..6506381 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -45,12 +45,12 @@
$(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo "$(call gb_Executable_get_target_for_build,uno)" \
- "-ro $(OUTDIR)/xml/uno_services.rdb" \
- "-ro $(OUTDIR)/bin/udkapi.rdb" \
- "-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
"-s com.sun.star.test.bridge.CppTestObject" \
"-u
'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
- "--singleaccept" > $@)
+ "--singleaccept" \
+ "-env:UNO_SERVICES='$(call gb_Helper_make_url,$(call
gb_Rdb_get_outdir_target,ure/services)) $(call gb_Helper_make_url,$(call
gb_Rdb_get_outdir_target,uno_services))'" \
+ "-env:UNO_TYPES='$(call gb_Helper_make_url,$(call
gb_UnoApiMerge_get_target,ure/types)) $(call
gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)'" \
+ > $@)
$(if $(filter-out WNT,$(OS)),chmod +x $@)
@@ -59,11 +59,15 @@ testtools_MY_CLASSPATH :=
$(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/
$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :|
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
- echo "java" \
+ echo \
+ "UNO_SERVICES='$(call gb_Helper_make_url,$(call
gb_Rdb_get_outdir_target,ure/services)) $(call gb_Helper_make_url,$(call
gb_Rdb_get_outdir_target,uno_services))'" \
+ "UNO_TYPES='$(call gb_Helper_make_url,$(call
gb_UnoApiMerge_get_target,ure/types)) $(call
gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)'" \
+ "java" \
"-classpath
$(testtools_MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \
"com.sun.star.comp.bridge.TestComponentMain" \
\""uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test"\" \
- "singleaccept"> $@)
+ "singleaccept" \
+ > $@)
$(if $(filter-out WNT,$(OS)),chmod +x $@)
$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :|
$(testtools_BRIDGEDIR)/.dir
@@ -72,11 +76,9 @@
$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(te
echo "JAVA_HOME=$(JAVA_HOME)" \
"LD_LIBRARY_PATH=$(OUTDIR)/lib" \
"$(call gb_Executable_get_target_for_build,uno)" \
- "-ro $(OUTDIR)/xml/ure/services.rdb" \
- "-ro $(OUTDIR)/xml/uno_services.rdb" \
- "-ro $(OUTDIR)/bin/udkapi.rdb" \
- "-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
"-s com.sun.star.test.bridge.BridgeTest" \
+ "-env:UNO_SERVICES='$(call gb_Helper_make_url,$(call
gb_Rdb_get_outdir_target,ure/services)) $(call gb_Helper_make_url,$(call
gb_Rdb_get_outdir_target,uno_services))'" \
+ "-env:UNO_TYPES='$(call gb_Helper_make_url,$(call
gb_UnoApiMerge_get_target,ure/types)) $(call
gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)'" \
"-env:URE_INTERNAL_JAVA_DIR=file://$(OUTDIR)/bin" \
"-env:URE_INTERNAL_LIB_DIR=file://$(OUTDIR)/lib" \
"-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \
@@ -87,12 +89,10 @@
$(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| $(testtools_
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo "$(call gb_Executable_get_target_for_build,uno)" \
- "-ro $(OUTDIR)/xml/ure/services.rdb" \
- "-ro $(OUTDIR)/xml/uno_services.rdb" \
- "-ro $(OUTDIR)/bin/udkapi.rdb" \
- "-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
"-s com.sun.star.test.bridge.BridgeTest --" \
"-u
'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
+ "-env:UNO_SERVICES='$(call gb_Helper_make_url,$(call
gb_Rdb_get_outdir_target,ure/services)) $(call gb_Helper_make_url,$(call
gb_Rdb_get_outdir_target,uno_services))'" \
+ "-env:UNO_TYPES='$(call gb_Helper_make_url,$(call
gb_UnoApiMerge_get_target,ure/types)) $(call
gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)'" \
> $@)
$(if $(filter-out WNT,$(OS)),chmod +x $@)
diff --git a/testtools/CustomTarget_uno_test.mk
b/testtools/CustomTarget_uno_test.mk
index bed453d..1b53281 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -29,22 +29,21 @@ $(eval $(call
gb_CustomTarget_CustomTarget,testtools/uno_test))
# this target is phony to run it every time
.PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test)
-# NOTE: the dependency on ure/services.rdb is there because we need some
+# NOTE: the dependency on ure/services.rdb is also there because we need some
# of the URE libs from stoc and this is the easiest way to ensure they
# are available when the test is run .-)
$(call gb_CustomTarget_get_target,testtools/uno_test) : \
- $(call gb_Rdb_get_outdir_target,uno_services) \
- $(call gb_Rdb_get_outdir_target,ure/services) \
$(call gb_Executable_get_target_for_build,uno) \
$(call gb_InternalUnoApi_get_target,bridgetest) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
- $(call gb_Package_get_target,cppuhelper_unorc)
- $(call gb_Helper_abbreviate_dirs,\
- $(call gb_Executable_get_target_for_build,uno) \
- -ro $(OUTDIR)/xml/uno_services.rdb \
- -ro $(OUTDIR)/bin/udkapi.rdb \
- -ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \
+ $(call gb_Package_get_target,cppuhelper_unorc) \
+ $(call gb_Rdb_get_outdir_target,uno_services) \
+ $(call gb_Rdb_get_outdir_target,ure/services) \
+ $(call gb_UnoApiMerge_get_target,ure/types)
+ $(call gb_Executable_get_target_for_build,uno) \
-s com.sun.star.test.bridge.BridgeTest \
- -- com.sun.star.test.bridge.CppTestObject)
+ -- com.sun.star.test.bridge.CppTestObject \
+ -env:UNO_SERVICES='$(call gb_Helper_make_url,$(call
gb_Rdb_get_outdir_target,ure/services)) $(call gb_Helper_make_url,$(call
gb_Rdb_get_outdir_target,uno_services))' \
+ -env:UNO_TYPES='$(call gb_Helper_make_url,$(call
gb_UnoApiMerge_get_target,ure/types)) $(call
gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)'
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
