diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:04:32 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:04:32 +0000 |
| commit | 5de8a7d470bfe074664181dce98fcd8dd3dc450a (patch) | |
| tree | 1b25358358ace59e369863a6d5a1fb4efcd587c9 /vcl/qa | |
| parent | 88389db10cd2a9e259f885697212e97175bb8fd7 (diff) | |
INTEGRATION: CWS ause069 (1.3.428); FILE MERGED
2006/12/01 17:26:53 hjs 1.3.428.1: #i70359# remove forced shell calls
Diffstat (limited to 'vcl/qa')
| -rwxr-xr-x | vcl/qa/complex/memCheck/makefile.mk | 10 | ||||
| -rw-r--r-- | vcl/qa/complex/persistent_window_states/makefile.mk | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/vcl/qa/complex/memCheck/makefile.mk b/vcl/qa/complex/memCheck/makefile.mk index cf532eda328e..0bd3e01ff5b3 100755 --- a/vcl/qa/complex/memCheck/makefile.mk +++ b/vcl/qa/complex/memCheck/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: rt $ $Date: 2005-09-09 11:38:33 $ +# last change: $Author: obo $ $Date: 2007-01-25 13:04:19 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -87,11 +87,11 @@ $(CLASSDIR)$/$(PACKAGE)$/CheckMemoryUsage.props : ALLTAR $(CLASSDIR)$/$(PACKAGE)$/CheckMemoryUsage.props : CheckMemoryUsage.props - +cp $(@:f) $@ - +jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(@:f) + cp $(@:f) $@ + jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(@:f) RUN: run run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_PACKAGE).CheckMemoryUsage + java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_PACKAGE).CheckMemoryUsage diff --git a/vcl/qa/complex/persistent_window_states/makefile.mk b/vcl/qa/complex/persistent_window_states/makefile.mk index 5d56b49dae19..0f690b46437a 100644 --- a/vcl/qa/complex/persistent_window_states/makefile.mk +++ b/vcl/qa/complex/persistent_window_states/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: rt $ $Date: 2005-09-09 11:39:24 $ +# last change: $Author: obo $ $Date: 2007-01-25 13:04:32 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -80,10 +80,10 @@ RUN: run # start an office if the parameter is set for the makefile .IF "$(OFFICE)" == "" run: - +@echo "Execute this test with 'dmake run OFFICE=/system/path/to/office/program'." - +@echo "The office will be started by the test with a socket connection on port 8100" + @echo "Execute this test with 'dmake run OFFICE=/system/path/to/office/program'." + @echo "The office will be started by the test with a socket connection on port 8100" .ELSE run: $(CLASSDIR)$/$(PACKAGE)$/$(TARGET).props - +java -cp $(CLASSPATH) $(CT_APP) -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" $(CT_TESTBASE) $(CT_TEST) + java -cp $(CLASSPATH) $(CT_APP) -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" $(CT_TESTBASE) $(CT_TEST) .ENDIF |