[Libreoffice-commits] core.git: solenv/gbuild

[Juergen Funk]

 solenv/gbuild/JunitTest.mk              |    2 +-
 solenv/gbuild/platform/com_MSC_class.mk |   17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 335ea1819b08dbefabb5d67445668d4868bb1db0
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date:   Fri Jun 12 15:00:12 2015 +0200

    make debugrun under Windows
    
    Debugging with Visual-Studio, attach to soffice.bin
    
    Description:
    Start
      make debugrun
    after the start of LO, in VS-Debugger
      "Attach to Process" to the soffice.bin
    then start in other box the test with
      make gb_JunitTest_DEBUGRUN=T JunitTest_YYY"
    
    Change-Id: I44571d1d4feafe9ce836d71781eaf793fe72cb92
    Reviewed-on: https://gerrit.libreoffice.org/16290
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 8370603..4078421 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -45,7 +45,7 @@ $(call gb_JunitTest_get_target,%) :
 		&& echo "to rerun just this failed test without all others, run:" \
 		&& echo && echo "    make JunitTest_$*" && echo \
 		&& echo "cd into the module dir to run the tests faster" \
-		&& echo "Or to do interactive debugging (non-Windows), run two shells with:" \
+		&& echo "Or to do interactive debugging, run two shells with:" \
 		&& echo \
 		&& echo "    make debugrun" \
 		&& echo "    make gb_JunitTest_DEBUGRUN=T JunitTest_$*" \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index b5ee0bc..6b39a4d 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -411,12 +411,27 @@ endif
 
 define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.exe}" \
+	-Dorg.openoffice.test.arg.soffice="$(gb_JunitTest_SOFFICEARG)" \
 	-Dorg.openoffice.test.arg.env=PATH="$$$$PATH" \
 	-Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1)))
+	-Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \
 
 endef
 
+
+define gb_Module_DEBUGRUNCOMMAND
+printf "\nAttach the debugger to soffice.bin\n\n"
+unset VCL_HIDE_WINDOWS && \
+OFFICESCRIPT=`mktemp` && \
+printf "$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.exe" > $${OFFICESCRIPT} && \
+printf " --norestore --nologo '--accept=pipe,name=$(USER);urp;'\n" >> $${OFFICESCRIPT} && \
+$(SHELL) $${OFFICESCRIPT} && \
+rm $${OFFICESCRIPT}
+endef
+
+
+
+
 # PythonTest class
 
 gb_PythonTest_PRECOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND)