Reduce bloat in test runners

bin/run-superuser-tests

@@ -1,36 +1,24 @@
 #!/bin/sh
 set -e
 
-##
-# functions
-run_test()
-{
-    testfile="${1}"
-    logfile="${2}"
-    ruby -Ilib \
-        "${testfile}" \
-        --no-use-color \
-        > "${logfile}" 2>&1
-}
-
 ##
 # main
-if [ "$(id -u)" = "0" ]; then
+if [ "$(id -u)" != "0" ]; then
+    echo "This script must be run by root"
+    exit 1
+fi
+
 bundle exec rake clean clobber compile
 rm -rf tmp/
-    for file in test/superuser/*_test.rb; do
+for test in test/superuser/*_test.rb; do
-        logfile=".runner.log_$(basename ${file})"
+    log=".$(basename "${test}")_log.txt"
-        if run_test "${file}" "${logfile}"; then
+    if ruby -Ilib "${test}" --no-use-color > "${log}" 2>&1; then
-            echo -n .
+        printf "."
-            rm "${logfile}"
+        rm "${log}"
     else
-            cat "${logfile}"
+        cat "${log}"
-            rm "${logfile}"
+        rm "${log}"
         exit 1
     fi
 done
 echo
-else
-    echo "This script must be run by root"
-    exit 1
-fi

bin/run-unprivileged-tests

@@ -1,35 +1,24 @@
 #!/bin/sh
 set -e
 
-##
-# functions
-run_test()
-{
-    testfile="${1}"
-    logfile="${2}"
-    ruby -Ilib \
-        "${testfile}" \
-        --no-use-color \
-        > "${logfile}" 2>&1
-}
-
 ##
 # main
-if [ "$(id -u)" != "0" ]; then
+if [ "$(id -u)" = "0" ]; then
+    echo "This script can't be run by root"
+    exit 1
+fi
+
 bundle exec rake clean clobber compile
-    for file in test/unprivileged/*_test.rb; do
+rm -rf tmp/
-        logfile=".runner.log_$(basename ${file})"
+for test in test/unprivileged/*_test.rb; do
-        if run_test "${file}" "${logfile}"; then
+    log=".$(basename "${test}")_log.txt"
-            echo -n .
+    if ruby -Ilib "${test}" --no-use-color > "${log}" 2>&1; then
-            rm "${logfile}"
+        printf "."
+        rm "${log}"
     else
-            cat "${logfile}"
+        cat "${log}"
-            rm "${logfile}"
+        rm "${log}"
         exit 1
     fi
 done
 echo
-else
-    echo "This script must be run by a user other than root"
-    exit 1
-fi