diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-06 10:24:25 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-06 10:24:25 +0100 |
| commit | c39367da2e179e86a170f5add409ea99d045a139 (patch) | |
| tree | 240911701178e974356637478729040a6cccfd6d /solenv/inc/installationtest.mk | |
| parent | aa84a911dc9dc8ff101ad0129c4219ba96f742df (diff) | |
| parent | 0a1c928e7e5d2d0ff8e954998b76b345966cbe79 (diff) | |
undoapi: merge after pulling CWS sb135
Diffstat (limited to 'solenv/inc/installationtest.mk')
| -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 fc8de794350a..b7b49c4aec3b 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 |