diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-10-06 17:42:39 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-10-06 17:42:39 +0200 |
| commit | a2d40703e4a5590a689ace4466f92e590434944d (patch) | |
| tree | 5e878fcc11eb94d96c65940ef3d30e922f217950 /test/integration/run-tests | |
| parent | ffd2dd93a640b47663ebdccc4fda00b426b3db71 (diff) | |
| parent | 00a06b8eb82cf930511fc003bd16d7034e5a0cb5 (diff) | |
make http size check work
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 d700cc3fc..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 "${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)) |