From cccc6a9a41262e7afefe52902fb5bf8d8a421ddf Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Mon, 26 Jun 2017 13:01:56 +0200 Subject: [PATCH] TT#17032 prove STDERR output is not a part of Jenkins's result XML Which confuses developers which are debugging failed tests, as details like below are not a part of XML Jenkins displays on a WEB: > # Failed test 'create test customer w/o profile package' > # at t/api-rest/api-balanceintervals.t line 1578. > # got: '500' > # expected: '201' > Use of uninitialized value in concatenation (.) or string at t/api-rest/api-balanceintervals.t line 1580. > Thread 4 terminated abnormally: malformed JSON string, neither array, object, number, string or atom, at character offset 0 (before "\n -m, --merge Merge test scripts' STDERR with their STDOUT. Change-Id: I945d4d8867fc9c061f96d067be14125af7cc5a46 --- t/api-rest/testrunner | 4 ++-- t/selenium/testrunner | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/t/api-rest/testrunner b/t/api-rest/testrunner index c4d744636e..a2317446a2 100755 --- a/t/api-rest/testrunner +++ b/t/api-rest/testrunner @@ -44,13 +44,13 @@ RC=0 if [ "${FORMAT}" = "junit" ] ; then # shellcheck disable=SC2086 - prove --formatter TAP::Formatter::JUnit -l -It/lib $SELECT | \ + prove -m --formatter TAP::Formatter::JUnit -l -It/lib $SELECT | \ tee -a "${OUTPUT_DIRECTORY}/api-rest.xml" RC=${PIPESTATUS[0]} else # api-threads.t and api-balanceintervals.t are failing with the "-Pretty option" :( # shellcheck disable=SC2086 - prove -v --color -l -It/lib $SELECT | tee -a "${OUTPUT_DIRECTORY}/api-rest.pretty" + prove -m -v --color -l -It/lib $SELECT | tee -a "${OUTPUT_DIRECTORY}/api-rest.pretty" RC=${PIPESTATUS[0]} fi diff --git a/t/selenium/testrunner b/t/selenium/testrunner index f6a6239b68..9fffeb279c 100755 --- a/t/selenium/testrunner +++ b/t/selenium/testrunner @@ -50,10 +50,10 @@ echo "echo -e '$PASSWORD_ENCODED' >/tmp/vncpasswd ; vncviewer geometry=1280x1024 RC=0 if [ -n "${3:-}" ] && [ "${3:-}" = "junit" ] ; then - CATALYST_SERVER=https://${SERVER}:1443/ prove --formatter TAP::Formatter::JUnit -l -It/lib t/selenium/*.t | \ + CATALYST_SERVER=https://${SERVER}:1443/ prove -m --formatter TAP::Formatter::JUnit -l -It/lib t/selenium/*.t | \ tee -a "${OUTPUT_DIRECTORY}/selenium.xml" || RC=$? else - CATALYST_SERVER="https://${SERVER}:1443" prove -v --color -l -It/lib t/selenium/*.t | \ + CATALYST_SERVER="https://${SERVER}:1443" prove -m -v --color -l -It/lib t/selenium/*.t | \ tee -a "${OUTPUT_DIRECTORY}/selenium.pretty" || RC=$? fi