diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2009-10-21 12:42:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2009-10-21 12:42:12 +0000 |
| commit | d0140adedea4d267dfb55084728d97cb03477d71 (patch) | |
| tree | 1997174d294408509cfce40e33d75198f6548eb1 /testtools | |
| parent | a24b4c98e339b330fb0048bb005755fde75a6a78 (diff) | |
#i105680# aha, unoidl.com.sun.star.test.bridge vs unoidl.test.testtools.bridgetest
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/cli/cli_vb_testobj.vb | 36 | ||||
| -rw-r--r-- | testtools/source/bridgetest/pyuno/makefile.mk | 8 |
2 files changed, 5 insertions, 39 deletions
diff --git a/testtools/source/bridgetest/cli/cli_vb_testobj.vb b/testtools/source/bridgetest/cli/cli_vb_testobj.vb index 721723009374..a03291f666af 100644 --- a/testtools/source/bridgetest/cli/cli_vb_testobj.vb +++ b/testtools/source/bridgetest/cli/cli_vb_testobj.vb @@ -201,42 +201,6 @@ Public Class VBBridgeTestObject Return m_testDataElements End Function - Public Overridable Function echoSmallStruct( _ - smallStruct As SmallStruct) As SmallStruct _ - Implements XBridgeTest2.echoSmallStruct -#if DEBUG - 'Console.WriteLine( "##### " + GetType().FullName + ".echoSmallStruct" ) -#endif - Return smallStruct - End Function - - Public Overridable Function echoMediumStruct( _ - mediumStruct As MediumStruct) As MediumStruct _ - Implements XBridgeTest2.echoMediumStruct -#if DEBUG - 'Console.WriteLine( "##### " + GetType().FullName + ".echoMediumStruct" ) -#endif - Return mediumStruct - End Function - - Public Overridable Function echoBigStruct( _ - bigStruct As BigStruct) As BigStruct _ - Implements XBridgeTest2.echoBigStruct -#if DEBUG - 'Console.WriteLine( "##### " + GetType().FullName + ".echoBigStruct" ) -#endif - Return bigStruct - End Function - - Public Overridable Function echoAllFloats( _ - allFloats As AllFloats) As AllFloats _ - Implements XBridgeTest2.echoAllFloats -#if DEBUG - 'Console.WriteLine( "##### " + GetType().FullName + ".echoAllFloats" ) -#endif - Return allFloats - End Function - ' Attributes --------------------------------------------------------- Public Overridable Property Bool As Boolean _ Implements XBridgeTest2.Bool diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk index f80979d09cca..bffce7689d1e 100644 --- a/testtools/source/bridgetest/pyuno/makefile.mk +++ b/testtools/source/bridgetest/pyuno/makefile.mk @@ -57,7 +57,6 @@ PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) python .ENDIF # "$(SYSTEM_PYTHON)"!="YES" .IF "$(GUI)"=="WNT" PYTHONPATH:=$(SOLARLIBDIR)$/pyuno;$(PWD);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload - .ELSE # "$(GUI)"=="WNT" PYTHONPATH:=$(SOLARLIBDIR)$/pyuno:$(PWD):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python$/lib-dynload .ENDIF # "$(GUI)"=="WNT" @@ -98,7 +97,7 @@ PYCOMPONENTS = \ ALL : \ $(PYFILES) \ $(DLLDEST)$/pyuno_regcomp.rdb \ - runtest \ + doc \ ALLTAR .ENDIF # L10N_framework @@ -117,7 +116,10 @@ $(DLLDEST)$/pyuno_regcomp.rdb: $(DLLDEST)$/uno_types.rdb $(SOLARBINDIR)$/pyuno_s -rm -f $@ $(WRAPCMD) $(REGMERGE) $(DLLDEST)$/pyuno_regcomp.rdb / $(DLLDEST)$/uno_types.rdb $(SOLARBINDIR)$/pyuno_services.rdb -runtest : $(DLLDEST)$/pyuno_regcomp.rdb $(PYFILES) +doc .PHONY: + @echo start test with dmake runtest + +runtest : ALL cd $(DLLDEST) && $(TEST_ENV) && $(PYTHON) main.py cd $(DLLDEST) && $(TEST_ENV) && $(WRAPCMD) $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy.rdb \ -l com.sun.star.loader.Python $(foreach,i,$(PYCOMPONENTS) -c vnd.openoffice.pymodule:$(i)) |