[Libreoffice-commits] .: solenv/gbuild

[David Tardon]

 solenv/gbuild/CppunitTest.mk |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4faa1a08c2d6a433fdf0696c80ac330944e1b586
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 5 09:34:39 2011 +0200

    make GDBCPPUNITTRACE usable with gbuild

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 039f5a6..b7049af 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -34,6 +34,9 @@ export DBGSV_ERROR_OUT
 
 ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
 gb_CppunitTest_GDBTRACE := gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace-stdout -return-child-result --args
+else ifneq ($(strip $(GDBCPPUNITTRACE)),)
+gb_CppunitTest_GDBTRACE := $(GDBCPPUNITTRACE)
+gb_CppunitTest__interactive := $(true)
 endif
 
 # defined by platform
@@ -71,7 +74,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET)
 	$(call gb_Output_announce,$*,$(true),CUT,2)
 	$(call gb_Helper_abbreviate_dirs_native,\
 		mkdir -p $(dir $@) && \
-		$(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) $(call gb_CppunitTest__make_args,$(ARGS),$(UNO_SERVICES),$(UNO_TYPES)) > $@.log 2>&1 || (cat $@.log && false))
+		$(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) $(call gb_CppunitTest__make_args,$(ARGS),$(UNO_SERVICES),$(UNO_TYPES)) $(if $(gb_CppunitTest__interactive),,> $@.log 2>&1 || (cat $@.log && false)))
 
 define gb_CppunitTest_CppunitTest
 $(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest__get_linktargetname,$(1)))