CWS-TOOLING: integrate CWS debuglevels

4 files changed, 38 insertions, 14 deletions

diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index fbd8f87617d5..441f97ceda50 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -200,7 +200,6 @@ finish
             SOLARSRC %SRC_ROOT%
             SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
             ANT_HOME %COMMON_BUILD_TOOLS%$/apache-ant-1.7.1
-            DBGSV_INIT %SOLARENV%/bin/dbgsv.ini
             WORKDIR %SOLARVERSION%/%INPATH%/workdir
             OUTDIR %SOLARVERSION%/%INPATH%
 
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a3b18a4a0bbd..c44ad5947010 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -28,6 +28,10 @@
 
 # CppunitTest class
 
+# in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
+DBGSV_ERROR_OUT := shell
+export DBGSV_ERROR_OUT
+
 # defined by platform
 #  gb_CppunitTest_TARGETTYPE
 #  gb_CppunitTest_get_filename
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index afc9486fd5a4..5699398241ca 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -30,6 +30,10 @@
 
 gb_JunitTest_JAVACOMMAND := $(JAVAINTERPRETER) $(JAVAIFLAGS)
 
+# in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
+DBGSV_ERROR_OUT := shell
+export DBGSV_ERROR_OUT
+
 .PHONY : $(call gb_JunitTest_get_clean_target,%)
 $(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_JunitTest_get_classsetname,%))
     $(call gb_Helper_abbreviate_dirs,\
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index b7b49c4aec3b..8553a739d5d1 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -23,6 +23,22 @@
 # for a copy of the LGPLv3 License.
 #***********************************************************************/
 
+# relevant for non-product builds only, but built unconditionally
+.IF "$(ABORT_ON_ASSERTION)" != ""
+    DBGSV_ERROR_OUT=abort
+    SAL_DIAGNOSE_ABORT=TRUE
+    .EXPORT: SAL_DIAGNOSE_ABORT
+.ELSE
+    DBGSV_ERROR_OUT=shell
+.ENDIF
+.EXPORT: DBGSV_ERROR_OUT
+
+# don't allow to overwrite DBGSV_ERROR_OUT with an INI file. Otherwise, people
+# might be tempted to put an DBGSV_INIT into their .bash_profile which points to a file
+# delcaring to ignore all assertions completely ...
+DBGSV_INIT=
+.EXPORT: DBGSV_INIT
+
 .IF "$(OS)" == "WNT"
 my_file = file:///
 .ELSE
@@ -79,28 +95,29 @@ my_javaenv = \
 # on other platforms, a single installation to solver is created in
 # smoketestoo_native:
 .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
+OOO_EXTRACT_TO:=$(shell cygpath -m `mktemp -dt ooosmoke.XXXXXX`)
 $(MISC)/$(TARGET)/installation.flag : $(shell \
         ls $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip)
-    $(MKDIRHIER) $(@:d)
-    my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) && \
-    unzip $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip \
-        -d "$$my_tmp" && \
-    mv "$$my_tmp"/OOo_*_install-arc_$(defaultlangiso) "$$my_tmp"/opt && \
-    echo "$$my_tmp" > $@
+    $(COMMAND_ECHO)$(MKDIRHIER) $(@:d)
+    $(COMMAND_ECHO)unzip -q $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip -d "$(OOO_EXTRACT_TO)"
+    $(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/OOo_*_install-arc_$(defaultlangiso) "$(OOO_EXTRACT_TO)"/opt
+    $(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@
 .END
 
 cpptest .PHONY :
-    $(RM) -r $(MISC)/$(TARGET)/user
-    $(MKDIRHIER) $(MISC)/$(TARGET)/user
+    $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user
+    $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user
     $(CPPUNITTESTER) \
         -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)
-    # As a workaround for #i111400#, ignore failure of $(RM):
-    - $(RM) -r $(MISC)/$(TARGET)/user
+        $(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)" == ""
-    $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
+    $(COMMAND_ECHO)$(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
 cpptest : $(MISC)/$(TARGET)/installation.flag
 .END
 
@@ -137,5 +154,5 @@ javatest : $(MISC)/$(TARGET)/installation.flag
 .END
 .ELSE
 javatest .PHONY :
-    echo 'javatest needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR'
+    @echo 'javatest needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR'
 .END