diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-10-27 15:57:12 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-10-27 15:57:12 +0100 |
| commit | e29a7a394cfd41e8bad81535e0a8c07654f34bf6 (patch) | |
| tree | c317e2f45aa1c96300028fb830555f248db5771e /test/integration/run-tests | |
| parent | bc5095b7d708c7e376f98be6edc2ad7cceca57ed (diff) | |
| parent | 28460cb27846b2437010b08adf10bde18e370974 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'test/integration/run-tests')
| -rwxr-xr-x | test/integration/run-tests | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/integration/run-tests b/test/integration/run-tests index d39daeee5..c39a2ac68 100755 --- a/test/integration/run-tests +++ b/test/integration/run-tests @@ -22,7 +22,7 @@ done export MSGLEVEL="${MSGLEVEL:-3}" if [ "$MSGCOLOR" != 'NO' ]; then - if ! expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then + if [ ! -t 1 ]; then # but check that we output to a terminal export MSGCOLOR='NO' fi fi @@ -39,9 +39,9 @@ fi TOTAL="$(run-parts --list $DIR | grep '/test-' | wc -l)" for testcase in $(run-parts --list $DIR | grep '/test-'); do if [ "$MSGLEVEL" -le 2 ]; then - echo -n "($(($ALL+1))/${TOTAL}) ${CTEST}Testcase ${CHIGH}$(basename ${testcase})${CRESET}: " + printf "($(($ALL+1))/${TOTAL}) ${CTEST}Testcase ${CHIGH}$(basename ${testcase})${CRESET}: " else - echo "${CTEST}Run Testcase ($(($ALL+1))/${TOTAL}) ${CHIGH}$(basename ${testcase})${CRESET}" + printf "${CTEST}Run Testcase ($(($ALL+1))/${TOTAL}) ${CHIGH}$(basename ${testcase})${CRESET}\n" fi if ! ${testcase}; then FAIL=$((FAIL+1)) |