cypress_test/run_parallel.sh | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit b16182c3c3f13949424efab9b2bee87f0c2ab48e
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Mon Aug 31 14:58:20 2020 +0200
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Mon Aug 31 15:41:03 2020 +0200
cypress: correctly append "Second chance!" string to the output.
Change-Id: I193b4b916babcda4e321b9c83e0301cc8a4b947f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101734
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/cypress_test/run_parallel.sh b/cypress_test/run_parallel.sh
index b73b2bb44..48feecef6 100755
--- a/cypress_test/run_parallel.sh
+++ b/cypress_test/run_parallel.sh
@@ -88,19 +88,20 @@ print_error() {
fi
}
-run_command() {
- rm -rf ${TEST_ERROR}
- echo "`echo ${RUN_COMMAND} && ${RUN_COMMAND} || touch ${TEST_ERROR}`" >
${TEST_LOG} 2>&1
+echo_command_run() {
+ echo "`echo ${RUN_COMMAND} && ${RUN_COMMAND} || touch ${TEST_ERROR}`"
}
mkdir -p `dirname ${TEST_LOG}`
touch ${TEST_LOG}
-run_command
+rm -rf ${TEST_ERROR}
+echo_command_run > ${TEST_LOG} 2>&1
if [ ! -f ${TEST_ERROR} ];
then cat ${TEST_LOG};
elif [ ${SECOND_CHANCE} = true ];
then echo "Second chance!" > ${TEST_LOG} && \
- run_command && \
+ rm -rf ${TEST_ERROR} && \
+ echo_command_run >> ${TEST_LOG} 2>&1 && \
if [ ! -f ${TEST_ERROR} ];\
then cat ${TEST_LOG};\
else cat ${TEST_LOG} >> ${ERROR_LOG} && \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
