From: Jens Lehmann <Jens.Lehmann@web.de>
Date: Thu, 19 Jun 2014 20:12:23 +0000 (+0200)
Subject: test-lib: add test_dir_is_empty()
X-Git-Tag: v2.1.0-rc0~23^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0be7d9b73d21443e216454564dd4df8d2a227789;p=git

test-lib: add test_dir_is_empty()

For the upcoming submodule test framework we often need to assert that an
empty directory exists in the work tree. Add the test_dir_is_empty()
function which asserts that the given argument is an empty directory.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index c617c826db..acd9a55cac 100644
--- 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