Reverse precedence order - prefer split xml generation
@@ -258,7 +258,13 @@ pid=$!
has_tail=true
tail -fq --pid $pid -s 0.001 /dev/null &> /dev/null || has_tail=false
-if [ "$has_tail" == true ] && [ -z "$no_echo" ]; then
+if [[ "${EXPERIMENTAL_SPLIT_XML_GENERATION}" == "1" ]]; then
+ if [ -z "$COVERAGE_DIR" ]; then
+ "${TEST_PATH}" "$@" 2>&1 || exitCode=$?
+ else
+ "$1" "$TEST_PATH" "${@:3}" 2>&1 || exitCode=$?
+ fi
+elif [ "$has_tail" == true ] && [ -z "$no_echo" ]; then
touch "${XML_OUTPUT_FILE}.log"
if [ -z "$COVERAGE_DIR" ]; then
("${TEST_PATH}" "$@" &>"${XML_OUTPUT_FILE}.log") &
@@ -270,13 +276,6 @@ if [ "$has_tail" == true ] && [ -z "$no_echo" ]; then
tail -fq --pid $pid -s 0.001 "${XML_OUTPUT_FILE}.log"
wait $pid
exitCode=$?
-else
- if [[ "${EXPERIMENTAL_SPLIT_XML_GENERATION}" == "1" ]]; then
- if [ -z "$COVERAGE_DIR" ]; then
- "${TEST_PATH}" "$@" 2>&1 || exitCode=$?
- else
- "$1" "$TEST_PATH" "${@:3}" 2>&1 || exitCode=$?
- fi
else
if [ -z "$COVERAGE_DIR" ]; then
"${TEST_PATH}" "$@" 2> >(tee -a "${XML_OUTPUT_FILE}.log" >&2) 1> >(tee -a "${XML_OUTPUT_FILE}.log") 2>&1 || exitCode=$?
@@ -284,7 +283,6 @@ else
"$1" "$TEST_PATH" "${@:3}" 2> >(tee -a "${XML_OUTPUT_FILE}.log" >&2) 1> >(tee -a "${XML_OUTPUT_FILE}.log") 2>&1 || exitCode=$?
fi
fi
-fi
for signal in $signals; do
trap - ${signal}
