Merge branch 'jn/parse-config-slot' into jk/colors

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 0377d3e2960cc282ce1a2c7cb629245728c82092..dafd6ad21a92bac48155af39ebb9a4baaf3c4970 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -489,6 +489,17 @@ test_path_is_dir () {
        fi
 }
 
+# Check if the directory exists and is empty as expected, barf otherwise.
+test_dir_is_empty () {
+       test_path_is_dir "$1" &&
+       if test -n "$(ls -a1 "$1" | egrep -v '^\.\.?$')"
+       then
+               echo "Directory '$1' is not empty, it contains:"
+               ls -la "$1"
+               return 1
+       fi
+}
+
 test_path_is_missing () {
        if [ -e "$1" ]
        then