strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cypress: fix build.

Browse source 
Change-Id: Ie8df2a37312c0bee5827cb9378c2147a6b30bffd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97228
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
This commit is contained in:
Tamás Zolnai 2020-06-26 15:05:19 +02:00
parent ef4799e312
commit e198daae3d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cypress_test/Makefile.am
View file

@ -139,8 +139,8 @@ run-cov: @JAILS_PATH@ $(NODE_BINS)
@echo "Run all tests..."
@echo
$(call start_loolwsd)
$(call run_desktop_tests,,COVERAGE_RUN="1")
$(call run_mobile_tests,,COVERAGE_RUN="1")
$(call run_desktop_tests,,,COVERAGE_RUN="1")
$(call run_mobile_tests,,,COVERAGE_RUN="1")
@$(KILL_COMMAND) || true
define run_JS_error_check
@ -207,7 +207,7 @@ define run_desktop_tests
$(CYPRESS_BINARY) run \
--browser $(CHROME) \
--headless \
$(DESKTOP_CONFIG)$(if $(2),$(COMMA)$(2),) \
$(DESKTOP_CONFIG)$(if $(3),$(COMMA)$(3)) \
$(if $(1), --spec=$(abs_dir)/integration_tests/desktop/$(1)) \
$(if $(PARALLEL_BUILD),,|| ($(KILL_COMMAND) && false)))
$(if $(PARALLEL_BUILD),\
@ -224,7 +224,7 @@ define run_mobile_tests
$(CYPRESS_BINARY) run \
--browser $(CHROME) \
--headless \
$(MOBILE_CONFIG)$(if $(2),$(COMMA)$(2),) \
$(MOBILE_CONFIG)$(if $(3),$(COMMA)$(3)) \
$(if $(1), --spec=$(abs_dir)/integration_tests/mobile/$(1)) \
$(if $(PARALLEL_BUILD),,|| ($(KILL_COMMAND) && false)))
$(if $(PARALLEL_BUILD),\