diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-21 18:18:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-21 18:18:31 (GMT) |
| commit | ad25da009e2a37306d2d53a8462f036ef532b4ff (patch) | |
| tree | e6d71ce06709b09066f2dc80276e3f8ea0cda8d6 /t/test-lib-functions.sh | |
| parent | 3b3b61c5d5ef93a68e9af3c17eebc09c96b71d08 (diff) | |
| parent | 1621c99c79875d6537edc59b6c2b4c2038a97b20 (diff) | |
| download | git-ad25da009e2a37306d2d53a8462f036ef532b4ff.zip git-ad25da009e2a37306d2d53a8462f036ef532b4ff.tar.gz git-ad25da009e2a37306d2d53a8462f036ef532b4ff.tar.bz2 | |
Merge branch 'jl/submodule-tests'
* jl/submodule-tests:
revert: add t3513 for submodule updates
stash: add t3906 for submodule updates
am: add t4255 for submodule updates
cherry-pick: add t3512 for submodule updates
pull: add t5572 for submodule updates
rebase: add t3426 for submodule updates
merge: add t7613 for submodule updates
bisect: add t6041 for submodule updates
reset: add t7112 for submodule updates
read-tree: add t1013 for submodule updates
apply: add t4137 for submodule updates
checkout: call the new submodule update test framework
submodules: add the lib-submodule-update.sh test library
test-lib: add test_dir_is_empty()
Diffstat (limited to 't/test-lib-functions.sh')
| -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 0377d3e..dafd6ad 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 |