diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-21 10:32:07 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-21 10:32:07 +0100 |
| commit | dd23e0428ff23f7217ae4dbc9798fc55d1275b13 (patch) | |
| tree | a4f3266a3d9d5930e2da3218dc23f318f60e7fe8 /solenv/inc/installationtest.mk | |
| parent | debuglevels: a little less verbosity (diff) | |
| download | core-dd23e0428ff23f7217ae4dbc9798fc55d1275b13.tar.gz core-dd23e0428ff23f7217ae4dbc9798fc55d1275b13.zip | |
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 ...
Diffstat (limited to 'solenv/inc/installationtest.mk')
| -rw-r--r-- | solenv/inc/installationtest.mk | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 23e95be60de5..13f8867df5e8 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -23,6 +23,16 @@ # for a copy of the LGPLv3 License. #***********************************************************************/ +# relevant for non-product builds only, but built unconditionally +DIAGNOSTICS_CONTROL_FILE=$(MISC)/dbgsvrc +DBGSV_INIT:=$(MAKEDIR)/$(DIAGNOSTICS_CONTROL_FILE) +.EXPORT: DBGSV_INIT + +.IF "$(ABORT_ON_ASSERTION)" != "" + SAL_DIAGNOSE_ABORT:=TRUE + .EXPORT: SAL_DIAGNOSE_ABORT +.ENDIF + .IF "$(OS)" == "WNT" my_file = file:/// .ELSE @@ -88,7 +98,7 @@ $(MISC)/$(TARGET)/installation.flag : $(shell \ $(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@ .END -cpptest .PHONY : +cpptest .PHONY : $(DIAGNOSTICS_CONTROL_FILE) $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user $(CPPUNITTESTER) \ @@ -104,7 +114,7 @@ cpptest : $(MISC)/$(TARGET)/installation.flag .END .IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != "" -javatest_% .PHONY : $(JAVATARGET) +javatest_% .PHONY : $(JAVATARGET) $(DIAGNOSTICS_CONTROL_FILE) $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ @@ -119,7 +129,7 @@ javatest_% .PHONY : $(JAVATARGET) $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag javatest : $(MISC)/$(TARGET)/installation.flag .END -javatest .PHONY : $(JAVATARGET) +javatest .PHONY : $(JAVATARGET) $(DIAGNOSTICS_CONTROL_FILE) $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ @@ -138,3 +148,12 @@ javatest : $(MISC)/$(TARGET)/installation.flag javatest .PHONY : @echo 'javatest needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR' .END + +# relevant for non-product builds only, but built unconditionally +$(DIAGNOSTICS_CONTROL_FILE): + $(COMMAND_ECHO)echo [output] > $@ +.IF "$(ABORT_ON_ASSERTION)" != "" + $(COMMAND_ECHO)echo error=abort >> $@ +.ELSE + $(COMMAND_ECHO)echo error=shell >> $@ +.ENDIF |