diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:41 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:41 +0100 |
| commit | f2574337dbf0d5d22d18ddbf0e8295c2ee6f4f3e (patch) | |
| tree | 2421fa506d7678110b547679b5b60473f44238b1 /smoketestoo_native/makefile.mk | |
| parent | a3e3f719efe2d7ca6afff7acea0dd3d264419865 (diff) | |
| parent | 5d7f1bb1e74ae49ae7215588d836bd1ca2004b10 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
smoketestdoc/com/sun/star/comp/smoketest/makefile.mk
smoketestdoc/data/Global.xml
smoketestdoc/data/OptionsDlg.xml
smoketestdoc/data/Test_10er.xml
smoketestoo_native/data/content.xml
smoketestoo_native/makefile.mk
Diffstat (limited to 'smoketestoo_native/makefile.mk')
| -rwxr-xr-x[-rw-r--r--] | smoketestoo_native/makefile.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index d9c4dace7f96..195ef4052645 100644..100755 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -29,6 +29,8 @@ TARGET = smoketest ENABLE_EXCEPTIONS = TRUE +ABORT_ON_ASSERTION = TRUE + .INCLUDE: settings.mk CFLAGSCXX += $(CPPUNIT_CFLAGS) @@ -56,7 +58,7 @@ ALLTAR : cpptest cpptest : $(SHL1TARGETN) -TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw +TEST_ARGUMENTS = smoketest.doc=$(OUTDIR)/bin$(UPDMINOREXT)/smoketestdoc.sxw CPPTEST_LIBRARY = $(SHL1TARGETN) .IF "$(OS)" != "WNT" |