diff options
author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-15 23:58:09 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-15 23:58:09 +0100 |
commit | 1c14599519ed693d9c9db3b564627559c9e813c3 (patch) | |
tree | 47f030bd7883248db5f098ff36a8dba4ec1173c6 /solenv/inc/installationtest.mk | |
parent | debuglevels: pulled and merged DEV300.m100 (diff) | |
download | core-1c14599519ed693d9c9db3b564627559c9e813c3.tar.gz core-1c14599519ed693d9c9db3b564627559c9e813c3.zip |
debuglevels: a little less verbosity
Diffstat (limited to 'solenv/inc/installationtest.mk')
-rw-r--r-- | solenv/inc/installationtest.mk | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index b7b49c4aec3b..23e95be60de5 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -79,28 +79,27 @@ my_javaenv = \ # on other platforms, a single installation to solver is created in # smoketestoo_native: .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" +OOO_EXTRACT_TO:=$(shell cygpath -m `mktemp -dt ooosmoke.XXXXXX`) $(MISC)/$(TARGET)/installation.flag : $(shell \ ls $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip) - $(MKDIRHIER) $(@:d) - my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) && \ - unzip $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip \ - -d "$$my_tmp" && \ - mv "$$my_tmp"/OOo_*_install-arc_$(defaultlangiso) "$$my_tmp"/opt && \ - echo "$$my_tmp" > $@ + $(COMMAND_ECHO)$(MKDIRHIER) $(@:d) + $(COMMAND_ECHO)unzip -q $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip -d "$(OOO_EXTRACT_TO)" + $(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/OOo_*_install-arc_$(defaultlangiso) "$(OOO_EXTRACT_TO)"/opt + $(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@ .END cpptest .PHONY : - $(RM) -r $(MISC)/$(TARGET)/user - $(MKDIRHIER) $(MISC)/$(TARGET)/user + $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user + $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user $(CPPUNITTESTER) \ -env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb \ -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \ -env:arg-soffice=$(my_soffice) -env:arg-user=$(MISC)/$(TARGET)/user \ $(my_cppenv) $(TEST_ARGUMENTS:^"-env:arg-testarg.") $(CPPTEST_LIBRARY) - # As a workaround for #i111400#, ignore failure of $(RM): - - $(RM) -r $(MISC)/$(TARGET)/user +# As a workaround for #i111400#, ignore failure of $(RM): + $(COMMAND_ECHO)- $(RM) -r $(MISC)/$(TARGET)/user .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" - $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag + $(COMMAND_ECHO)$(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag cpptest : $(MISC)/$(TARGET)/installation.flag .END @@ -137,5 +136,5 @@ javatest : $(MISC)/$(TARGET)/installation.flag .END .ELSE javatest .PHONY : - echo 'javatest needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR' + @echo 'javatest needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR' .END |