Updated test_runner and versions from upstream.

2 files changed, 12 insertions, 5 deletions

diff --git a/lib/versions b/lib/versions
index ea46ccc..95eebd3 100755
--- a/lib/versions
+++ b/lib/versions
@@ -82,15 +82,20 @@ versions_osVersion() {
       os_version_=`expr "${os_release_}" : '\([0-9]*\.[0-9]*\)-.*'`
       ;;
     Linux)
-      if [ -r "${LSB_RELEASE}" ]; then
+      if [ -r '/etc/os-release' ]; then
+          os_version_=`awk -F= '$1~/PRETTY_NAME/{print $2}' /etc/os-release \
+            |sed 's/"//g'`
+      elif [ -r '/etc/redhat-release' ]; then
+        os_version_=`cat /etc/redhat-release`
+      elif [ -r '/etc/SuSE-release' ]; then
+        os_version_=`head -n 1 /etc/SuSE-release`
+      elif [ -r "${LSB_RELEASE}" ]; then
         if grep -q 'DISTRIB_ID=Ubuntu' "${LSB_RELEASE}"; then
           # shellcheck disable=SC2002
           os_version_=`cat "${LSB_RELEASE}" \
             |awk -F= '$1~/DISTRIB_DESCRIPTION/{print $2}' \
             |sed 's/"//g;s/ /-/g'`
         fi
-      elif [ -r '/etc/redhat-release' ]; then
-        os_version_=`cat /etc/redhat-release`
       fi
       ;;
     SunOS)
diff --git a/test_runner b/test_runner
index 6c2182e..7207e14 100755
--- a/test_runner
+++ b/test_runner
@@ -27,14 +27,16 @@ RUNNER_SHELLS='/bin/sh ash /bin/bash /bin/dash /bin/ksh /bin/pdksh /bin/zsh'
 RUNNER_TEST_SUFFIX='_test.sh'
 
 runner_warn() { echo "runner:WARN $*" >&2; }
+runner_error() { echo "runner:ERROR $*" >&2; }
 runner_fatal() { echo "runner:FATAL $*" >&2; exit 1; }
 
 runner_usage() {
   echo "usage: ${RUNNER_ARGV0} [-e key=val ...] [-s shell(s)] [-t test(s)]"
 }
 
-_runner_tests() { echo *${RUNNER_TEST_SUFFIX}; }
+_runner_tests() { echo ./*${RUNNER_TEST_SUFFIX} |sed 's#./##g'; }
 _runner_testName() {
+  # shellcheck disable=SC1117
   _runner_testName_=$(expr "${1:-}" : "\(.*\)${RUNNER_TEST_SUFFIX}")
   if [ -n "${_runner_testName_}" ]; then
     echo "${_runner_testName_}"
@@ -86,7 +88,7 @@ main() {
 
   # Error checking.
   if [ -z "${tests}" ]; then
-    th_error 'no tests found to run; exiting'
+    runner_error 'no tests found to run; exiting'
     exit 1
   fi