From: Andreas Schneider <asn@samba.org>
Date: Thu, 22 Dec 2022 12:13:54 +0000 (+0100)
Subject: testprogs: Fix remove_directory()
X-Git-Tag: talloc-2.4.0~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a32c8087a6ecd2aaa46e3f7728c99f862f553a1;p=thirdparty%2Fsamba.git

testprogs: Fix remove_directory()

common_test_fns.inc: line 121: [: too many arguments

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/testprogs/blackbox/common_test_fns.inc b/testprogs/blackbox/common_test_fns.inc
index 68465e1e61a..a9e94b82e99 100755
--- a/testprogs/blackbox/common_test_fns.inc
+++ b/testprogs/blackbox/common_test_fns.inc
@@ -118,7 +118,7 @@ remove_directory()
 	local xdir=${1}
 	shift
 
-	if [ "$xdir" == "/" ] || [ ! -d "$xdir" ] || [ ! $(ls -A "$xdir") ]; then
+	if [ "$xdir" == "/" ] || [ ! -d "$xdir" ] || [ -z "$(ls -A "$xdir")" ]; then
 		return
 	fi