summaryrefslogtreecommitdiff
path: root/solenv/inc/installationtest.mk
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2011-02-25 11:32:55 +0100
committersb <sb@openoffice.org>2011-02-25 11:32:55 +0100
commita788821b83eb68decaf53cdbeaed042dd3d697b3 (patch)
tree8a212bd7fbd0308f2101579248c8fdb2de4798a7 /solenv/inc/installationtest.mk
parentd3dfac3e375a996966d934b31aad9ad77ad4f63b (diff)
debuglevels: #i117073# added cppunittester --protector support; added unoexceptionprotector and use it in installationtest.mk; reverted changes to smoketest.cxx obsoleted by these additions
Diffstat (limited to 'solenv/inc/installationtest.mk')
-rw-r--r--solenv/inc/installationtest.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 96b09edebeff..8553a739d5d1 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -111,7 +111,9 @@ cpptest .PHONY :
-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)
+ $(my_cppenv) $(TEST_ARGUMENTS:^"-env:arg-testarg.") --protector \
+ $(SOLARSHAREDBIN)/unoexceptionprotector$(DLLPOST) \
+ unoexceptionprotector $(CPPTEST_LIBRARY)
# As a workaround for #i111400#, ignore failure of $(RM):
$(COMMAND_ECHO)- $(RM) -r $(MISC)/$(TARGET)/user
.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""