Jens Lehmann <Jens.Lehmann@xxxxxx> writes:
> 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@xxxxxx>
> ---
> t/test-lib-functions.sh | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
> index 158e10a..546f0a6 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 "$(ls -a1 "$1" | egrep -v '^\.\.?$')"
It is safer to say "test -n" when testing an emptyness of a string
whose contents you do not know or control (e.g. the string may begin
with "-something").
> + then
> + echo "Directory '$1' is not empty, it contains:"
> + ls -la "$1"
> + return 1
> + fi
> +}
> +
> test_path_is_missing () {
> if [ -e "$1" ]
> then
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html