From 34e9c90f0fed7344b15b7ca84f094f7b25630fcf Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 3 Sep 2017 10:55:04 +0200 Subject: [PATCH] fix log output of integration tests --- tools/integration-tests-helper.sh | 3 ++- tools/integration-tests.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/integration-tests-helper.sh b/tools/integration-tests-helper.sh index 424d7088a..eabe7e625 100755 --- a/tools/integration-tests-helper.sh +++ b/tools/integration-tests-helper.sh @@ -46,5 +46,6 @@ function villas_format_supports_header() { } function colorize() { + RANDOM=$BASHPID echo -e "\x1b[0;$((31 + $RANDOM % 7))m$1\x1b[0m" -} \ No newline at end of file +} diff --git a/tools/integration-tests.sh b/tools/integration-tests.sh index 46b0565b1..58b10db18 100755 --- a/tools/integration-tests.sh +++ b/tools/integration-tests.sh @@ -91,7 +91,7 @@ for TEST in ${TESTS}; do # Show full log in case of an error if (( ${VERBOSE} == 0 )); then - if (( $RC != 99 )) || (( $RC != 0 )); then + if (( $RC != 99 )) && (( $RC != 0 )); then cat ${LOGDIR}/${TESTNAME}.log fi fi