diff options
author | sb <sb@openoffice.org> | 2010-02-03 13:49:27 +0100 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-02-03 13:49:27 +0100 |
commit | ea4df3844d354705e338663e281899b482f95544 (patch) | |
tree | d0933ac35edd5cdf79a82cea268a850375b6402c /smoketestoo_native | |
parent | 04d1a5812d3e8292714f69cffee7b68031c8dae2 (diff) |
sb118: reverted parts of HG -c 160b248247a0 again: the "static code executing before SAL_MAIN" problem was too severe; instead, globally set DBGSV_INIT build env var to new solenv/bin/dbgsv.ini
Diffstat (limited to 'smoketestoo_native')
-rw-r--r-- | smoketestoo_native/dbgsv.ini | 27 | ||||
-rw-r--r-- | smoketestoo_native/makefile.mk | 2 | ||||
-rw-r--r-- | smoketestoo_native/smoketest.cxx | 5 |
3 files changed, 2 insertions, 32 deletions
diff --git a/smoketestoo_native/dbgsv.ini b/smoketestoo_native/dbgsv.ini deleted file mode 100644 index 86e525645e27..000000000000 --- a/smoketestoo_native/dbgsv.ini +++ /dev/null @@ -1,27 +0,0 @@ -=************************************************************************* -= DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -= -= Copyright 2010 by Sun Microsystems, Inc. -= -= OpenOffice.org - a multi-platform office productivity suite -= -= This file is part of OpenOffice.org. -= -= OpenOffice.org is free software: you can redistribute it and/or modify -= it under the terms of the GNU Lesser General Public License version 3 -= only, as published by the Free Software Foundation. -= -= OpenOffice.org is distributed in the hope that it will be useful, -= but WITHOUT ANY WARRANTY; without even the implied warranty of -= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -= GNU Lesser General Public License version 3 for more details -= (a copy is included in the LICENSE file that accompanied this code). -= -= You should have received a copy of the GNU Lesser General Public License -= version 3 along with OpenOffice.org. If not, see -= <http://www.openoffice.org/license.html> -= for a copy of the LGPLv3 License. -=***********************************************************************/ - -[output] -error=shell diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index e1045d69c22d..4b29bb6b13b8 100644 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -72,7 +72,7 @@ smoketest .PHONY: $(MISC)/installation.flag $(SHL1TARGETN) \ -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \ -env:arg-path=$(my_path) -env:arg-user=$(MISC)/user \ -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 + -env:arg-doc=$(BIN)/smoketestdoc.sxw .IF "$(OS)" == "WNT" $(RM) -r $(MISC)/installation.flag `cat $(MISC)/installation.flag` .ENDIF diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx index f7c2c8d30040..4536dd9f9ea9 100644 --- a/smoketestoo_native/smoketest.cxx +++ b/smoketestoo_native/smoketest.cxx @@ -193,12 +193,9 @@ void Test::setUp() { RTL_CONSTASCII_USTRINGPARAM("-env:UNO_JAVA_JFW_ENV_JREHOME=true")); rtl::OUString classpathArg( RTL_CONSTASCII_USTRINGPARAM("-env:UNO_JAVA_JFW_ENV_CLASSPATH=true")); - rtl::OUString dbgsvArg( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-env:DBGSV_INIT=")) + - getArgument(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dbgsv")))); rtl_uString * args[] = { noquickArg.pData, nofirstArg.pData, acceptArg.pData, userArg.pData, - jreArg.pData, classpathArg.pData, dbgsvArg.pData }; + jreArg.pData, classpathArg.pData }; rtl_uString ** envs = 0; rtl::OUString argEnv; if (getOptionalArgument( |