Fix etest to allow test names with dashes.

[marshall-mcmullen]

Fix etest to allow test names with dashes.

This fixes #193

[marshall-mcmullen]

diff --git a/share/eprogress.sh b/share/eprogress.sh
index b04e0c1..a8f9453 100644
--- a/share/eprogress.sh
+++ b/share/eprogress.sh
@@ -98,11 +98,6 @@ eprogress()
                 printf "%s" "${file_content}"
             fi

-            # Check done flag early so we always display final file state before exiting
-            if [[ ${done} -eq 1 ]]; then
-                break
-            fi
-
             if [[ ${time} -eq 1 ]] ; then

                 # Terminal magic that moves our cursor to the bottom right corner of the screen then backs it up just
@@ -123,6 +118,11 @@ eprogress()
             # Clear to end of line after time display
             ecolor clear_to_eol

+            # Check done flag after displaying final file and time state
+            if [[ ${done} -eq 1 ]]; then
+                break
+            fi
+
             # Optionally sleep if delay was requested. Use background sleep + wait for interruptibility.
             if [[ -n "${delay}" ]]; then
                 sleep "${delay}" &

[marshall-mcmullen]

Another fix

diff --git a/share/etest/runners.sh b/share/etest/runners.sh
index 2908cb1..1bdcbd7 100644
--- a/share/etest/runners.sh
+++ b/share/etest/runners.sh
@@ -848,14 +848,14 @@ __update_jobs_progress_file()
         printf "  Passed: $(ecolor bold green)%*s" ${width} ${NUM_TESTS_PASSED}
         ecolor reset

+        printf "  Skipped: $(ecolor bold yellow)%*s" ${width} ${NUM_TESTS_SKIPPED:-0}
+        ecolor reset
+
         if [[ "${NUM_TESTS_FAILED}" -gt 0 ]]; then
             printf "  Failed: $(ecolor bold red)%*s" ${width} ${NUM_TESTS_FAILED}
             ecolor reset
         fi

-        printf "  Skipped: $(ecolor bold yellow)%*s" ${width} ${NUM_TESTS_SKIPPED:-0}
-        ecolor reset
-
         echo -n " "

     } > "${tmpfile}" 2>/dev/null || true

[marshall-mcmullen]

more consistent ordering

diff --git a/share/etest/results.sh b/share/etest/results.sh
index 88563e5..a19d857 100644
--- a/share/etest/results.sh
+++ b/share/etest/results.sh
@@ -179,12 +179,12 @@ create_results_log()

         local total
         total=$(( NUM_TESTS_PASSED + NUM_TESTS_FAILED + NUM_TESTS_SKIPPED ))
-        printf "%s%s Total: %s%d%s  Passed: %s%d%s  Failed: %s%d%s  Skipped: %s%d%s" \
+        printf "%s%s Total: %s%d%s  Passed: %s%d%s  Skipped: %s%d%s  Failed: %s%d%s" \
             "$(ecolor bold green)>>" "$(ecolor off)" \
             "$(ecolor bold)" "${total}" "$(ecolor off)" \
             "$(ecolor bold green)" "${NUM_TESTS_PASSED}" "$(ecolor off)" \
-            "$(ecolor red)" "${NUM_TESTS_FAILED}" "$(ecolor off)" \
-            "$(ecolor bold yellow)" "${NUM_TESTS_SKIPPED}" "$(ecolor off)"
+            "$(ecolor bold yellow)" "${NUM_TESTS_SKIPPED}" "$(ecolor off)" \
+            "$(ecolor red)" "${NUM_TESTS_FAILED}" "$(ecolor off)"

         local runtime
         if [[ ${DURATION} -ge 60 ]]; then
@@ -246,12 +246,12 @@ create_summary()
         echo
         local total
         total=$(( NUM_TESTS_PASSED + NUM_TESTS_FAILED + NUM_TESTS_SKIPPED ))
-        printf "%s%s Total: %s%d%s  Passed: %s%d%s  Failed: %s%d%s  Skipped: %s%d%s" \
+        printf "%s%s Total: %s%d%s  Passed: %s%d%s  Skipped: %s%d%s  Failed: %s%d%s" \
             "$(ecolor bold green)>>" "$(ecolor off)" \
             "$(ecolor bold)" "${total}" "$(ecolor off)" \
             "$(ecolor bold green)" "${NUM_TESTS_PASSED}" "$(ecolor off)" \
-            "$(ecolor red)" "${NUM_TESTS_FAILED}" "$(ecolor off)" \
-            "$(ecolor bold yellow)" "${NUM_TESTS_SKIPPED}" "$(ecolor off)"
+            "$(ecolor bold yellow)" "${NUM_TESTS_SKIPPED}" "$(ecolor off)" \
+            "$(ecolor red)" "${NUM_TESTS_FAILED}" "$(ecolor off)"

         # Runtime
         local runtime
diff --git a/share/etest/runners.sh b/share/etest/runners.sh
index 1bdcbd7..4d25f33 100644
--- a/share/etest/runners.sh
+++ b/share/etest/runners.sh
@@ -870,7 +870,7 @@ __display_results_table()
     echo

     declare -a table
-    array_init_nl table "Suite|Result|# Passed|# Failed|# Skipped"
+    array_init_nl table "Suite|Result|# Passed|# Skipped|# Failed"

     local suite_name
     for suite_name in "${TEST_SUITES[@]}"; do
@@ -911,7 +911,7 @@ __display_results_table()
             skipped_display="$(ecolor bold yellow)${skipped}$(ecolor none)"
         fi

-        array_add_nl table "${suite_name}|${status}|${passed}|${failed_display}|${skipped_display}"
+        array_add_nl table "${suite_name}|${status}|${passed}|${skipped_display}|${failed_display}"
     done

     etable --style=boxart --title="$(ecolor bold)Test Results$(ecolor none)" "${table[@]}"