From ad36c8bb35f3ff5666363d876be319497a28001f Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 11 Feb 2011 11:08:08 +0100 Subject: debuglevels: outsourced creation of the smoketest doc into an own module, so it can be used outside smoketesoo_native, too --- smoketestoo_native/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 smoketestoo_native/makefile.mk (limited to 'smoketestoo_native/makefile.mk') diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk old mode 100644 new mode 100755 index 18f3a42b789f..aa7d4f5a0725 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -56,7 +56,7 @@ ALLTAR : cpptest cpptest : $(SHL1TARGETN) -TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw +TEST_ARGUMENTS = smoketest.doc=$(OUTDIR)/bin$(PROEXT)/smoketestdoc.sxw CPPTEST_LIBRARY = $(SHL1TARGETN) .IF "$(OS)" != "WNT" -- cgit From 1275251797b8ce74312d91a9e0f5252068ebd6c8 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Sun, 13 Feb 2011 20:15:05 +0100 Subject: debuglevels: bin, not binPROEXT --- smoketestoo_native/makefile.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'smoketestoo_native/makefile.mk') diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index aa7d4f5a0725..76ea6c2c52ae 100755 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -56,18 +56,18 @@ ALLTAR : cpptest cpptest : $(SHL1TARGETN) -TEST_ARGUMENTS = smoketest.doc=$(OUTDIR)/bin$(PROEXT)/smoketestdoc.sxw +TEST_ARGUMENTS = smoketest.doc=$(OUTDIR)/bin$(UPDMINOREXT)/smoketestdoc.sxw CPPTEST_LIBRARY = $(SHL1TARGETN) .IF "$(OS)" != "WNT" $(installationtest_instpath).flag : $(shell ls \ $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).tar.gz) - $(RM) -r $(installationtest_instpath) - $(MKDIRHIER) $(installationtest_instpath) - cd $(installationtest_instpath) && $(GNUTAR) xfz \ + $(COMMAND_ECHO)$(RM) -r $(installationtest_instpath) + $(COMMAND_ECHO)$(MKDIRHIER) $(installationtest_instpath) + $(COMMAND_ECHO)cd $(installationtest_instpath) && $(GNUTAR) xfz \ $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).tar.gz - $(MV) $(installationtest_instpath)/OOo_*_install-arc_$(defaultlangiso) \ + $(COMMAND_ECHO)$(MV) $(installationtest_instpath)/OOo_*_install-arc_$(defaultlangiso) \ $(installationtest_instpath)/opt - $(TOUCH) $@ + $(COMMAND_ECHO)$(TOUCH) $@ cpptest : $(installationtest_instpath).flag .END -- cgit From 123c60ed46489e3147d58ab6684c9de1cf0f656d Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 21 Feb 2011 10:32:07 +0100 Subject: debuglevels: let smoketestoo_native use a dedicated version of dbgsvrc/DBGSV_INIT, instead of using the default which the build env points to - it might direct assertion output to whereever ... --- smoketestoo_native/makefile.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'smoketestoo_native/makefile.mk') diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index 76ea6c2c52ae..aab245371a72 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) -- cgit