cypress_test/Makefile.am | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit dde40739f62ee3e7b52b9f8a9157aacdceadc145
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Tue Apr 14 20:27:00 2020 +0200
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Tue Apr 14 20:48:07 2020 +0200
cypress: write out the command for running the test file in case of failure.
Change-Id: Iba856ee675a4a545e7f44d396a92638633ec9540
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92225
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 5b616084b..5b1f5fd14 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -159,7 +159,7 @@ define run_desktop_tests
$(if $(1),
--spec=$(abs_dir)/integration_tests/desktop/$(1)) \
$(if $(PARALLEL_BUILD),,|| ($(KILL_COMMAND) && false)))
$(if $(PARALLEL_BUILD),\
- $(call execute_run_parallel,$(RUN_COMMAND),$(2))\
+ $(call execute_run_parallel,$(RUN_COMMAND),$(2),"make
check-desktop spec=$(1)")\
,\
$(RUN_COMMAND)\
)
@@ -176,7 +176,7 @@ define run_mobile_tests
$(if $(1),
--spec=$(abs_dir)/integration_tests/mobile/$(1)) \
$(if $(PARALLEL_BUILD),,|| ($(KILL_COMMAND) && false)))
$(if $(PARALLEL_BUILD),\
- $(call execute_run_parallel,$(RUN_COMMAND),$(2))\
+ $(call execute_run_parallel,$(RUN_COMMAND),$(2),"make
check-mobile spec=$(1)")\
,\
$(RUN_COMMAND)\
)
@@ -192,9 +192,15 @@ define execute_run_parallel
echo "`echo $(1) && $(1)`" >> $(2) 2>&1 && \
if [ -z `grep -o -m 1 "Error:" $(2)` ];\
then cat $(2);\
- else cat $(2) >> $(ERROR_LOG); \
+ else cat $(2) >> $(ERROR_LOG)&& \
+ echo "" >> $(ERROR_LOG) && \
+ echo "To run this test file call: $(3)" >>
$(ERROR_LOG) &&\
+ echo "" >> $(ERROR_LOG); \
fi;\
- else cat $(2) >> $(ERROR_LOG);\
+ else cat $(2) >> $(ERROR_LOG) && \
+ echo "" >> $(ERROR_LOG) && \
+ echo "To run this test file call: $(3)" >> $(ERROR_LOG) &&\
+ echo "" >> $(ERROR_LOG); \
fi;
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
