diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-10 10:43:43 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-10 10:44:08 +0200 |
| commit | f5af917e3b91037002419ba33c6921a74ca7d4e1 (patch) | |
| tree | 1536705641b9f5464597504f31a706e4ac56e446 /solenv | |
| parent | 24460da8d18bcc0df87824a1402080a97a8797ab (diff) | |
uitest: running uitests under gdb makefile part
Change-Id: If1e1d9217cfcc1f51fa611457ac7758fd2d9960b
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UITest.mk | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk index 2f839c3c026c..ed6b9ac58627 100644 --- a/solenv/gbuild/UITest.mk +++ b/solenv/gbuild/UITest.mk @@ -21,6 +21,11 @@ gb_UITest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD) gb_UITest_DEPS := endif +ifneq ($(strip $(UITESTTRACE)),) +gb_UITest_GDBTRACE := --gdb +gb_UITest__interactive := $(true) +endif + gb_UITest_COMMAND := $(gb_UITest_EXECUTABLE) $(SRCDIR)/uitest/test_main.py .PHONY : $(call gb_UITest_get_clean_target,%) @@ -36,7 +41,8 @@ $(call gb_UITest_get_target,%) :| $(gb_UITest_DEPS) $(call gb_Helper_abbreviate_dirs,\ rm -rf $(dir $(call gb_UITest_get_target,$*)) && \ mkdir -p $(dir $(call gb_UITest_get_target,$*)) && \ - rm -fr $@.core && mkdir $@.core && cd $@.core && \ + $(if $(gb_UITest__interactive),, \ + rm -fr $@.core && mkdir $@.core && cd $@.core && ) \ ($(gb_UITest_PRECOMMAND) \ $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \ $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \ @@ -53,11 +59,13 @@ $(call gb_UITest_get_target,%) :| $(gb_UITest_DEPS) --soffice=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice \ --userdir=$(call gb_Helper_make_url,$(dir $(call gb_UITest_get_target,$*))user) \ --dir=$(SRCDIR)/uitest/$(strip $(MODULES)) \ - > $@.log 2>&1 \ - || ($(if $(value gb_CppunitTest_postprocess), \ - RET=$$?; \ - $(call gb_CppunitTest_postprocess,$(gb_UITest_EXECUTABLE_GDB),$@.core,$$RET) >> $@.log 2>&1;) \ - cat $@.log; $(gb_UITest_UNITTESTFAILED) Python $*))) + $(gb_UITest_GDBTRACE) \ + $(if $(gb_UITest__interactive),, \ + > $@.log 2>&1 \ + || ($(if $(value gb_CppunitTest_postprocess), \ + RET=$$?; \ + $(call gb_CppunitTest_postprocess,$(gb_UITest_EXECUTABLE_GDB),$@.core,$$RET) >> $@.log 2>&1;) \ + cat $@.log; $(gb_UITest_UNITTESTFAILED) Python $*)))) # always use udkapi and URE services define gb_UITest_UITest |