[Libreoffice-commits] .: solenv/gbuild

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Wed Jun 1 10:19:42 PDT 2011


 solenv/gbuild/JunitTest.mk |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 706c4c75b64b377483ae658674692cb26e96a602
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Jun 1 16:43:01 2011 +0200

    add debug hook for junit tests

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index bbbddcf..feac6f0 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -47,7 +47,15 @@ $(call gb_JunitTest_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),JUT,2)
 	$(call gb_Helper_abbreviate_dirs_native,\
 		mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
-		$(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(if $(strip $(gb_JunitTest_HEADLESS)),-Dorg.openoffice.test.arg.headless=$(gb_JunitTest_HEADLESS)) $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false))
+		$(gb_JunitTest_JAVACOMMAND) \
+            -cp "$(CLASSPATH)" \
+            $(if $(strip $(gb_JunitTest_HEADLESS)),\
+                -Dorg.openoffice.test.arg.headless=$(gb_JunitTest_HEADLESS)) \
+            $(if $(strip $(gb_JunitTest_DEBUGCOMMAND)),\
+                '-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \
+            $(DEFS) \
+            org.junit.runner.JUnitCore \
+            $(CLASSES) 2>&1 > $@.log || (cat $@.log && false))
 	$(CLEAN_CMD)
 
 define gb_JunitTest_JunitTest


More information about the Libreoffice-commits mailing list