diff options
| author |  Jens Lehmann <Jens.Lehmann@web.de> | 2014-06-19 22:12:23 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-06-20 10:20:42 -0700 |
| commit | 0be7d9b73d21443e216454564dd4df8d2a227789 (patch) | |
| tree | c6d40d9339f5730593d72ee69768665ff693f439 | |
| parent | Third batch for 2.1 (diff) | |
| download | tgif-0be7d9b73d21443e216454564dd4df8d2a227789.tar.xz | |
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>
| -rw-r--r-- | t/test-lib-functions.sh | 11 |
1 files changed, 11 insertions, 0 deletions
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 |