[Libreoffice-commits] online.git: cypress_test/run_parallel.sh
cypress_test/run_parallel.sh | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit b16182c3c3f13949424efab9b2bee87f0c2ab48e
Author: Tamás Zolnai
AuthorDate: Mon Aug 31 14:58:20 2020 +0200
Commit: Tamás Zolnai
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
Reviewed-by: Tamás Zolnai
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
[Libreoffice-commits] online.git: cypress_test/run_parallel.sh
cypress_test/run_parallel.sh |8
1 file changed, 8 insertions(+)
New commits:
commit 3753406ed2e15f25c4282b73963f44994dec0b92
Author: Tamás Zolnai
AuthorDate: Fri Aug 7 14:20:42 2020 +0200
Commit: Tamás Zolnai
CommitDate: Fri Aug 7 14:59:49 2020 +0200
cypress: update error message with multi-user interactive runner command.
Change-Id: Iccaa3fd3fd27133b21a099e463debb3e4d226c5f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100312
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/run_parallel.sh b/cypress_test/run_parallel.sh
index 0da1ea5c2..b73b2bb44 100755
--- a/cypress_test/run_parallel.sh
+++ b/cypress_test/run_parallel.sh
@@ -77,6 +77,14 @@ print_error() {
echo -e "\
Open the failing test in the interactive test runner:\n\
\tcd cypress_test && make run-${COMMAND} spec=${SPEC}\n" >> ${ERROR_LOG}
+elif [[ ${TEST_FILE} == *"user1"* ]]; then
+echo -e "\
+Open the failing test in the interactive test runner:\n\
+\tcd cypress_test && make run-${COMMAND} spec=${SPEC} user=1\n" >>
${ERROR_LOG}
+else
+echo -e "\
+Open the failing test in the interactive test runner:\n\
+\tcd cypress_test && make run-${COMMAND} spec=${SPEC} user=2\n" >>
${ERROR_LOG}
fi
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
