]> www.infradead.org Git - users/sagi/blktests.git/commitdiff
check: less dots
authorOmar Sandoval <osandov@fb.com>
Tue, 9 May 2017 19:06:56 +0000 (12:06 -0700)
committerOmar Sandoval <osandov@fb.com>
Tue, 9 May 2017 19:06:56 +0000 (12:06 -0700)
Signed-off-by: Omar Sandoval <osandov@fb.com>
check

diff --git a/check b/check
index c14286b04b1fcd547f9c1dbf432d6b30995ccccc..697d8bf56485a15937e7de85f049f97e5d066aa9 100755 (executable)
--- a/check
+++ b/check
@@ -76,28 +76,16 @@ _write_test_run() {
        done
 }
 
-_output_last_test_run() {
-       if [[ -v TEST_DEV ]]; then
-               echo "$TEST_NAME => $(basename "$TEST_DEV") ..."
-       else
-               echo "$TEST_NAME ..."
-       fi
-
-       local key value
-       while IFS= read -r key; do
-               if [[ $key =~ ^date|status|reason|exit_status$ ]]; then
-                       continue
-               fi
-               value="${LAST_TEST_RUN["$key"]}"
-               echo "    ${key} ${value} ..."
-       done < <(printf '%s\n' "${!LAST_TEST_RUN[@]}" | sort)
-}
-
 _output_status() {
        local test="$1"
        local status="$2"
 
-       printf '%.40s' "$test ........................................"
+       printf '%-25s ... %15s' "$test" ''
+       if [[ -z $status ]]; then
+               echo
+               return
+       fi
+
        echo -n " ["
        if [[ -t 1 ]]; then
                case "$status" in
@@ -119,6 +107,23 @@ _output_status() {
        echo "]"
 }
 
+_output_last_test_run() {
+       if [[ -v TEST_DEV ]]; then
+               _output_status "$TEST_NAME => $(basename "$TEST_DEV")" ""
+       else
+               _output_status "$TEST_NAME" ""
+       fi
+
+       local key value
+       while IFS= read -r key; do
+               if [[ $key =~ ^date|status|reason|exit_status$ ]]; then
+                       continue
+               fi
+               value="${LAST_TEST_RUN["$key"]}"
+               echo "    ${key} ${value} ..."
+       done < <(printf '%s\n' "${!LAST_TEST_RUN[@]}" | sort)
+}
+
 _output_test_run() {
        if [[ -t 1 ]]; then
                # -4 for date, status, reason, and exit_status, which we don't