diff options
Diffstat (limited to 'testtools/source/bridgetest')
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 5 | ||||
| -rw-r--r-- | testtools/source/bridgetest/pyuno/makefile.mk | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index 0abe1ab09767..8ce4116f1107 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -42,11 +42,6 @@ BATCH_SUFFIX=.bat 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)/))) -.ELIF "$(GUI)"=="OS2" -BATCH_SUFFIX=.cmd -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 GIVE_EXEC_RIGHTS=chmod +x MY_URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR) diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk index 417bdfc584e3..b5d90cb21b3c 100644 --- a/testtools/source/bridgetest/pyuno/makefile.mk +++ b/testtools/source/bridgetest/pyuno/makefile.mk @@ -56,7 +56,7 @@ PYTHONPATH:=$(SOLARLIBDIR)$/pyuno:$(PWD):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$ .ENDIF # "$(GUI)"=="WNT" .EXPORT: PYTHONPATH -.IF "$(GUI)"!="WNT" && "$(GUI)"!="OS2" +.IF "$(GUI)"!="WNT" TEST_ENV=export FOO=file://$(shell @pwd)$/$(DLLDEST) \ UNO_TYPES=uno_types.rdb UNO_SERVICES=pyuno_services.rdb .ELSE # "$(GUI)" != "WNT" |