sb135: #i116159# work around i111400 for now; should be reverted when that issue is fixed
This commit is contained in:
parent
6086cec5c2
commit
71ad34cea8
1 changed files with 2 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue