diff options
| author | sb <sb@openoffice.org> | 2010-12-17 15:01:52 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-12-17 15:01:52 +0100 |
| commit | 71ad34cea830663f2c88735e37d45fd3be38f30a (patch) | |
| tree | 89f97e5e3c5073bfb9472e193f857fd23ab961ad /solenv | |
| parent | sb135: #i116046# fixed jurt.com.sun.star.lib.uno.protocols.urp.Cache typo, ad... (diff) | |
| download | core-71ad34cea830663f2c88735e37d45fd3be38f30a.tar.gz core-71ad34cea830663f2c88735e37d45fd3be38f30a.zip | |
sb135: #i116159# work around i111400 for now; should be reverted when that issue is fixed
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/installationtest.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 8540140d1533..5d99bdeb0e2a 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -97,7 +97,8 @@ cpptest .PHONY : -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) - $(RM) -r $(MISC)/$(TARGET)/user + # As a workaround for #i111400#, ignore failure of $(RM): + - $(RM) -r $(MISC)/$(TARGET)/user .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag cpptest : $(MISC)/$(TARGET)/installation.flag |