summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-04-25 14:31:43 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-04-27 08:19:35 +0200
commitb863ec95b2305588453432725b9f528168760ca4 (patch)
tree33f80e584ebe33720700c500697fd1f92aa93300 /solenv
parente0e8f5f60f9912cd2e12818cd1bc2eb6c3e1e75f (diff)
generate more useful message when uitest crashes
not at all perfect, because debugging these things is still painful Change-Id: I88952cac2e01d0c8b49384f0fe05775ffe3add64 Reviewed-on: https://gerrit.libreoffice.org/53449 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/UITest.mk2
-rwxr-xr-xsolenv/gbuild/uitest-failed-default.sh30
2 files changed, 31 insertions, 1 deletions
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index b71b125e8949..03d30448ef7b 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -9,7 +9,7 @@
# UITest class
-gb_UITest_UNITTESTFAILED ?= $(GBUILDDIR)/platform/unittest-failed-default.sh
+gb_UITest_UNITTESTFAILED ?= $(GBUILDDIR)/uitest-failed-default.sh
ifeq ($(SYSTEM_PYTHON),)
gb_UITest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE)
diff --git a/solenv/gbuild/uitest-failed-default.sh b/solenv/gbuild/uitest-failed-default.sh
new file mode 100755
index 000000000000..4dc648bb6ab7
--- /dev/null
+++ b/solenv/gbuild/uitest-failed-default.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+# -*- Mode: sh; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+cat << EOF
+
+Error: a unit test failed:
+
+To rerun just this failed test without all others, run:
+ make UITest_$2
+
+Or to do interactive debugging, put a long sleep in the beginning of the .py
+uitest file, and attach gdb to the running soffice process.
+
+EOF
+
+# In theory, we could add this text, but it really doesn't work very well.
+#
+# Or to do interactive debugging, run two shells with:
+# make debugrun
+# make gb_UITest_DEBUGRUN=T UITest_$2
+
+exit 1
+
+# vim: set et sw=4: