diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 09:45:58 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 09:45:58 +0000 |
| commit | c711d45c98e5812ba61ee865f5d03d1d9c655a89 (patch) | |
| tree | 9ccabdc40ed42281039351f8f5439434776adb37 /extensions/qa | |
| parent | b7a946748f5315fd723dc07ec727bad1330f6177 (diff) | |
INTEGRATION: CWS dba23a (1.3.176); FILE MERGED
2007/03/01 12:00:26 fs 1.3.176.1: respect env variables for runner parameters
Diffstat (limited to 'extensions/qa')
| -rw-r--r-- | extensions/qa/integration/extensions/makefile.mk | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/extensions/qa/integration/extensions/makefile.mk b/extensions/qa/integration/extensions/makefile.mk index bfcca3e9518f..5b2fd0a28577 100644 --- a/extensions/qa/integration/extensions/makefile.mk +++ b/extensions/qa/integration/extensions/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: rt $ $Date: 2006-05-04 09:00:35 $ +# last change: $Author: kz $ $Date: 2007-05-10 10:45:58 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -56,6 +56,23 @@ JARCLASSDIRS = $(PACKAGE) JARTARGET = $(TARGET).jar JARCOMPRESS = TRUE +# --- Runner Settings ---------------------------------------------- + +# create connection string for OOoRunner +.IF "$(RUNNER_CONNECTION_STRING)" == "" + .IF "$(OOO_RUNNER_PORT)" == "" + OOO_RUNNER_PORT=8100 + .ENDIF + .IF "$(OOO_RUNNER_HOST)" == "" + OOO_RUNNER_HOST=localhost + .ENDIF + RUNNER_CONNECTION_STRING=socket,host=$(OOO_RUNNER_HOST),port=$(OOO_RUNNER_PORT) +.ENDIF + +# classpath and argument list +RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/ConnectivityTools.jar +RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex -cs $(RUNNER_CONNECTION_STRING) + # --- Targets ------------------------------------------------------ .IF "$(depend)" == "" @@ -66,10 +83,6 @@ ALL: ALLDEP .INCLUDE : target.mk - -RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/ConnectivityTools.jar -RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex - run: java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce extensions_complex.sce |