diff options
| -rw-r--r-- | smoketestoo_native/makefile.mk | 27 | ||||
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 12 | ||||
| -rw-r--r-- | testtools/source/bridgetest/pyuno/makefile.mk | 19 |
3 files changed, 4 insertions, 54 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index 62c8f12bf5f7..caba56802f44 100644 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -61,28 +61,6 @@ my_path = \ my_path = $(MISC)/installation/opt/openoffice.org3/program/soffice .END -.IF "$(OOO_LIBRARY_PATH_VAR)" != "" -.IF "$(USE_SHELL)" == "bash" -my_arg_env = \ - -env:arg-env=$(OOO_LIBRARY_PATH_VAR)"$${{$(OOO_LIBRARY_PATH_VAR)+=$$$(OOO_LIBRARY_PATH_VAR)}}" -.ELSE -# The tcsh case is somewhat imprecise in that it treats a null environment -# variable the same as an unset one: -.IF "$($(OOO_LIBRARY_PATH_VAR))" == "" -my_arg_env = -env:arg-env=$(OOO_LIBRARY_PATH_VAR) -.ELSE -my_arg_env = -env:arg-env=$(OOO_LIBRARY_PATH_VAR)='$($(OOO_LIBRARY_PATH_VAR))' -.END -.END -.END - -.IF "$(USE_SHELL)" == "bash" -my_set_tmp = my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) -.ELSE -my_set_tmp = export my_tmp `mktemp -dt ooosmoke.XXXXXX` && \ - export my_tmp `cygpath -m $my_tmp` -.END - ALLTAR: smoketest smoketest .PHONY: $(MISC)/installation.flag $(SHL1TARGETN) \ @@ -93,7 +71,8 @@ smoketest .PHONY: $(MISC)/installation.flag $(SHL1TARGETN) \ -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/services.rdb \ -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \ -env:arg-path=$(my_path) -env:arg-user=$(MISC)/user \ - -env:arg-doc=$(BIN)/smoketestdoc.sxw $(my_arg_env) + -env:arg-doc=$(BIN)/smoketestdoc.sxw \ + -env:arg-env=$(OOO_LIBRARY_PATH_VAR)"$${{$(OOO_LIBRARY_PATH_VAR)+=$$$(OOO_LIBRARY_PATH_VAR)}}" .IF "$(OS)" == "WNT" $(RM) -r $(MISC)/installation.flag `cat $(MISC)/installation.flag` .ENDIF @@ -104,7 +83,7 @@ smoketest .PHONY: $(MISC)/installation.flag $(SHL1TARGETN) \ # removed after smoketest); can be removed once issue 50885 is fixed: $(MISC)/installation.flag: .IF "$(OS)" == "WNT" - $(my_set_tmp) && \ + my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) && \ unzip \ $(SRC_ROOT)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)/OOo_*_install.zip \ -d "$$my_tmp" && \ diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index f9c952d4d40e..4f7a3c064170 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -158,24 +158,16 @@ $(DLLDEST)$/uno_types.rdb : $(SOLARBINDIR)$/udkapi.rdb $(REGMERGE) $@ / $(BIN)$/bridgetest.rdb $(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 \ -s com.sun.star.test.bridge.BridgeTest -- \ -u \''uno:socket,host=127.0.0.1,port=2002;urp;test'\' > $@ -.ELSE - echo ERROR: this script can only be created properly for USE_SHELL=bash > $@ -.ENDIF $(GIVE_EXEC_RIGHTS) $@ $(DLLDEST)$/bridgetest_server$(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.CppTestObject \ -u \''uno:socket,host=127.0.0.1,port=2002;urp;test'\' --singleaccept \ > $@ -.ELSE - echo ERROR: this script can only be created properly for USE_SHELL=bash > $@ -.ENDIF $(GIVE_EXEC_RIGHTS) $@ @@ -195,14 +187,10 @@ $(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk $(GIVE_EXEC_RIGHTS) $@ $(DLLDEST)$/bridgetest_inprocess_java$(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 \ -env:URE_INTERNAL_JAVA_DIR=$(MY_URE_INTERNAL_JAVA_DIR) \ -- com.sun.star.test.bridge.JavaTestObject noCurrentContext > $@ -.ELSE - echo ERROR: this script can only be created properly for USE_SHELL=bash > $@ -.ENDIF $(GIVE_EXEC_RIGHTS) $@ .ENDIF diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk index bffce7689d1e..c5282368413c 100644 --- a/testtools/source/bridgetest/pyuno/makefile.mk +++ b/testtools/source/bridgetest/pyuno/makefile.mk @@ -45,11 +45,6 @@ ENABLE_EXCEPTIONS=TRUE PYEXC=$(DLLDEST)$/python$(EXECPOST) REGEXC=$(DLLDEST)$/regcomp$(EXECPOST) -DOLLAR_SIGN=\$$ -.IF "$(USE_SHELL)" != "tcsh" -DOLLAR_SIGN=$$ -.ENDIF - .IF "$(SYSTEM_PYTHON)"!="YES" PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python .ELSE # "$(SYSTEM_PYTHON)"!="YES" @@ -63,25 +58,13 @@ PYTHONPATH:=$(SOLARLIBDIR)$/pyuno:$(PWD):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$ .EXPORT: PYTHONPATH .IF "$(GUI)"!="WNT" && "$(GUI)"!="OS2" -.IF "$(USE_SHELL)"=="bash" TEST_ENV=export FOO=file://$(shell @pwd)$/$(DLLDEST) \ UNO_TYPES=pyuno_regcomp.rdb UNO_SERVICES=pyuno_regcomp.rdb -.ELSE -TEST_ENV=\ - setenv FOO file://$(shell @pwd)$/$(DLLDEST) && \ - setenv UNO_TYPES pyuno_regcomp.rdb && setenv UNO_SERVICES pyuno_regcomp.rdb -.ENDIF .ELSE # "$(GUI)" != "WNT" # aaaaaa, how to get the current working directory on windows ??? CWD_TMP=$(strip $(shell @echo "import os;print os.getcwd()" | $(PYTHON))) -.IF "$(USE_SHELL)" == "tcsh" -TEST_ENV=setenv FOO file:///$(strip $(subst,\,/ $(CWD_TMP)/$(DLLDEST))) && \ - setenv UNO_TYPES pyuno_regcomp.rdb && setenv UNO_SERVICES pyuno_regcomp.rdb -.ELSE TEST_ENV=export FOO=file:///$(strip $(subst,\,/ $(CWD_TMP)$/$(DLLDEST))) && \ export UNO_TYPES=pyuno_regcomp.rdb && export UNO_SERVICES=pyuno_regcomp.rdb -.ENDIF "$(USE_SHELL)" == "tcsh" - .ENDIF # "$(GUI)"!="WNT" PYFILES = \ $(DLLDEST)$/core.py \ @@ -124,6 +107,6 @@ runtest : ALL 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)) cd $(DLLDEST) && $(TEST_ENV) && $(WRAPCMD) $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \ - -l com.sun.star.loader.Python -c vnd.sun.star.expand:$(DOLLAR_SIGN)FOO/samplecomponent.py + -l com.sun.star.loader.Python -c vnd.sun.star.expand:$$FOO/samplecomponent.py .ENDIF # L10N_framework |