Skip to content

C
core
Kaydet (Commit) b7b89c96 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

The testtools component libs are layer NONE, not URELIB 

Change-Id: I513ca71792ed9d4010a90041f3f5b818816374c8
üst 85561702
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
Repository.mk
Dosyayı görüntüle @ b7b89c96
...@@ -435,6 +435,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ ...@@ -435,6 +435,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
smoketest \ smoketest \
subsequenttest \ subsequenttest \
test \ test \
testtools_cppobj \
testtools_bridgetest \
testtools_constructors \
unobootstrapprotector \ unobootstrapprotector \
unoexceptionprotector \ unoexceptionprotector \
unotest \ unotest \
...@@ -608,12 +611,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ ...@@ -608,12 +611,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
pythonloader \ pythonloader \
)) ))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
testtools_cppobj \
testtools_bridgetest \
testtools_constructors \
))
$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
cppu \ cppu \
sal \ sal \
......
testtools/CustomTarget_bridgetest.mk
Dosyayı görüntüle @ b7b89c96
...@@ -31,6 +31,7 @@ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_ ...@@ -31,6 +31,7 @@ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_
"-s com.sun.star.test.bridge.CppTestObject" \ "-s com.sun.star.test.bridge.CppTestObject" \
"-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \ "-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
"--singleaccept" \ "--singleaccept" \
"-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR))" \
"-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))" \ "-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))" \
"-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \
> $@) > $@)
...@@ -60,6 +61,7 @@ $(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(te ...@@ -60,6 +61,7 @@ $(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(te
"LD_LIBRARY_PATH=$(OUTDIR)/lib" \ "LD_LIBRARY_PATH=$(OUTDIR)/lib" \
"$(call gb_Executable_get_target_for_build,uno)" \ "$(call gb_Executable_get_target_for_build,uno)" \
"-s com.sun.star.test.bridge.BridgeTest" \ "-s com.sun.star.test.bridge.BridgeTest" \
"-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR))" \
"-env:URE_INTERNAL_JAVA_DIR=file://$(OUTDIR)/bin" \ "-env:URE_INTERNAL_JAVA_DIR=file://$(OUTDIR)/bin" \
"-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))" \ "-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))" \
"-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \
...@@ -73,6 +75,7 @@ $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| $(testtools_ ...@@ -73,6 +75,7 @@ $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| $(testtools_
echo "$(call gb_Executable_get_target_for_build,uno)" \ echo "$(call gb_Executable_get_target_for_build,uno)" \
"-s com.sun.star.test.bridge.BridgeTest --" \ "-s com.sun.star.test.bridge.BridgeTest --" \
"-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \ "-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
"-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR))" \
"-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))" \ "-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))" \
"-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \
> $@) > $@)
......
testtools/CustomTarget_uno_test.mk
Dosyayı görüntüle @ b7b89c96
...@@ -22,6 +22,7 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \ ...@@ -22,6 +22,7 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
$(call gb_Executable_get_command,uno) \ $(call gb_Executable_get_command,uno) \
-s com.sun.star.test.bridge.BridgeTest \ -s com.sun.star.test.bridge.BridgeTest \
-- com.sun.star.test.bridge.CppTestObject \ -- com.sun.star.test.bridge.CppTestObject \
-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \
-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services)) \ -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services)) \
-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)) -env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment