diff options
| author | sb <sb@openoffice.org> | 2010-01-27 16:23:59 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-01-27 16:23:59 +0100 |
| commit | 947441fda5c7a99ec42afa3b94961d05356c04d8 (patch) | |
| tree | e9099396bc1a92ce08d94da088451256b37f0add /smoketestoo_native/makefile.mk | |
| parent | 3dab44e4086e96cbdbcf5692091a82ef1fdebe55 (diff) | |
sb118: changed tools/debug to never fall back from writing to shell to writing to file, and read DBGSV_INIT from rtl::Bootstrap; the latter causes problems if tools/debug is called from static code executing before SAL_MAIN has called osl_setCommandArgs -> removed statics from code and added assertions to osl/process; various improvements to smoketests.cxx (incl. passing an appropriate dbgsv.ini for non-pro builds)
Diffstat (limited to 'smoketestoo_native/makefile.mk')
| -rw-r--r-- | smoketestoo_native/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index 541cfea9aa46..e104f5feb648 100644 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -71,8 +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 \ - -env:arg-env=$(OOO_LIBRARY_PATH_VAR)"$${{$(OOO_LIBRARY_PATH_VAR)+=$$$(OOO_LIBRARY_PATH_VAR)}}" + -env:arg-env=$(OOO_LIBRARY_PATH_VAR)"$${{$(OOO_LIBRARY_PATH_VAR)+=$$$(OOO_LIBRARY_PATH_VAR)}}" \ + -env:arg-dbgsv=$(PWD)/dbgsv.ini -env:arg-doc=$(BIN)/smoketestdoc.sxw .IF "$(OS)" == "WNT" $(RM) -r $(MISC)/installation.flag `cat $(MISC)/installation.flag` .ENDIF |