summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-11-25 15:14:09 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-11-25 15:14:33 +0100
commitbb149de2b4d3458c0db1958edbbb75e79a8a53c4 (patch)
tree0517ac52f197216c8c26d86d8e0963d596367091
parenta65b46b71d0f95119b343f4e931a318703889b08 (diff)
some hints cleanup
-rw-r--r--Makefile.in7
-rw-r--r--solenv/gbuild/JunitTest.mk12
2 files changed, 15 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 9f58d3339e05..443305b1441a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,13 +46,18 @@ dev-install: build
printf \
'\nDeveloper installation finished, you can now execute:\n\n' \
&& \
- if test `uname -s` = Darwin; then \
+ if test `uname -s` = Linux; then \
+ printf 'make debugrun\n'; \
+ elif test `uname -s` = Darwin; then \
printf 'open %s/install/LibreOffice.app\n' "@abs_builddir@"; \
else \
printf 'cd %s/install/program\n. ./ooenv\n./soffice.bin\n' \
"@abs_builddir@"; \
fi
+debugrun : dev-install
+ @. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk debugrun
+
check : allcheck
@true
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 33d068c93e28..ab0d67f9ca3c 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -58,9 +58,15 @@ $(call gb_JunitTest_get_target,%) :
-e 'at java.lang.reflect.' \
-e 'at sun.reflect.' $@.log \
&& echo "see full error log at $@.log" \
- && echo "to rerun just this failed test without all others, run either:" \
- && echo "cd \$$MODULE && make $@" \
- && echo "make -f $(SRCDIR)/GNUmakefile.mk $@" && false)) && \
+ && echo "to rerun just this failed test without all others, run:" \
+ && echo && echo " make $@" && echo \
+ && echo "add \"-f $(SRCDIR)/GNUmakefile.mk\" if you are not in the module dir" \
+ && echo "Or to do interactive debugging, run two shells with (Linux only):" \
+ && echo \
+ && echo " make debugrun" \
+ && echo " make gb_JunitTest_DEBUGRUN=T $@" \
+ && echo \
+ && false)) && \
rm -rf $(call gb_JunitTest_get_userdir,$*))
$(CLEAN_CMD)