diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-22 05:27:22 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-22 18:19:33 +0200 |
| commit | 4fa28812f3574efaca42769e9e4ff28f7d545bd8 (patch) | |
| tree | ef0376117ac6f402595b84598b341f8c0c41e4b8 /solenv | |
| parent | 660e5597813f88b1aca564198fdf5f78298adc13 (diff) | |
uitest: start the switch to python's unittest
Change-Id: Ic6e0d99a567b7080928accb61ed036b1c25ec7ff
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UITest.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk index bbe76f6bebff..dc6ea53c9395 100644 --- a/solenv/gbuild/UITest.mk +++ b/solenv/gbuild/UITest.mk @@ -21,7 +21,7 @@ gb_UITest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD) gb_UITest_DEPS := endif -gb_UITest_COMMAND := $(gb_UITest_EXECUTABLE) $(SRCDIR)/uitest/main.py +gb_UITest_COMMAND := $(gb_UITest_EXECUTABLE) $(SRCDIR)/uitest/test_main.py .PHONY : $(call gb_UITest_get_clean_target,%) $(call gb_UITest_get_clean_target,%) : @@ -52,13 +52,12 @@ $(call gb_UITest_get_target,%) :| $(gb_UITest_DEPS) $(gb_UITest_COMMAND) \ --soffice=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice \ --userdir=$(call gb_Helper_make_url,$(dir $(call gb_UITest_get_target,$*))user) \ - --file=$(SRCDIR)/uitest/$(strip $(MODULES)) \ - $(if $(gb_CppunitTest__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 $*)))) + --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 $*))) # always use udkapi and URE services define gb_UITest_UITest |