summaryrefslogtreecommitdiff
path: root/testtools
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2009-10-08 10:00:51 +0000
committerCaolán McNamara <cmc@openoffice.org>2009-10-08 10:00:51 +0000
commit54b3e9e4c3cf2da4158fcb03efe7de2a6d06171c (patch)
tree40f8ca118067f011564de4ff718681bfad00fcfa /testtools
parent52da3422e45f201a06aad88dfef80ee8d155750d (diff)
#i105680# might as well remove bridgetest_inprocess as we'll run its original content during the build
Diffstat (limited to 'testtools')
-rw-r--r--testtools/source/bridgetest/makefile.mk12
1 files changed, 0 insertions, 12 deletions
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index da2ed1cbc4b1..ee0db9724115 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -52,7 +52,6 @@ GIVE_EXEC_RIGHTS=@echo
MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell @$(WRAPCMD) echo $(SOLARBINDIR))))
MY_LOCAL_CLASSDIR=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(PWD)$/$(CLASSDIR))))
.ELSE
-BATCH_INPROCESS=bridgetest_inprocess
GIVE_EXEC_RIGHTS=chmod +x
MY_URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR)
MY_LOCAL_CLASSDIR=file://$(PWD)$/$(CLASSDIR)
@@ -137,7 +136,6 @@ ALLTAR: \
runtest \
$(DLLDEST)$/uno_types.rdb \
$(DLLDEST)$/uno_services.rdb \
- $(DLLDEST)$/bridgetest_inprocess$(BATCH_SUFFIX) \
$(DLLDEST)$/bridgetest_server$(BATCH_SUFFIX) \
$(DLLDEST)$/bridgetest_client$(BATCH_SUFFIX) \
$(JAVATARGETS)
@@ -155,16 +153,6 @@ $(DLLDEST)$/uno_types.rdb : $(SOLARBINDIR)$/udkapi.rdb
$(GNUCOPY) $? $@
$(REGMERGE) $@ / $(BIN)$/bridgetest.rdb
-$(DLLDEST)$/bridgetest_inprocess$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk
-.IF "$(USE_SHELL)" == "bash"
- echo '$(AUGMENT_LIBRARY_PATH)' '$(SOLARBINDIR)'/uno -ro uno_services.rdb -ro uno_types.rdb \
- -s com.sun.star.test.bridge.BridgeTest -- \
- com.sun.star.test.bridge.CppTestObject > $@
-.ELSE
- echo ERROR: this script can only be created properly for USE_SHELL=bash > $@
-.ENDIF
- $(GIVE_EXEC_RIGHTS) $@
-
$(DLLDEST)$/bridgetest_client$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk
.IF "$(USE_SHELL)" == "bash"
echo '$(AUGMENT_LIBRARY_PATH)' '$(SOLARBINDIR)'/uno -ro uno_services.rdb -ro uno_types.rdb \