From: Andrei Pavel <andrei@isc.org>
Date: Wed, 6 Jan 2021 22:57:49 +0000 (+0200)
Subject: [#1630] fix remove_if_exists not removing a file
X-Git-Tag: Kea-1.9.4~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b54776fdb96fbc97b4fe8b8602d717f65ddfdf5;p=thirdparty%2Fkea.git

[#1630] fix remove_if_exists not removing a file
---

diff --git a/src/bin/admin/tests/memfile_tests.sh.in b/src/bin/admin/tests/memfile_tests.sh.in
index c5394f4306..c68f3814f0 100644
--- a/src/bin/admin/tests/memfile_tests.sh.in
+++ b/src/bin/admin/tests/memfile_tests.sh.in
@@ -23,6 +23,7 @@ set -eu
 kea_admin="@abs_top_builddir@/src/bin/admin/kea-admin"
 kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc"
 
+# Clean up any files used in testing.
 clean_up() {
     remove_if_exists \
         "${config_file-}" \
diff --git a/src/lib/testutils/dhcp_test_lib.sh.in b/src/lib/testutils/dhcp_test_lib.sh.in
index c9c93f448a..fb5e110fcf 100644
--- a/src/lib/testutils/dhcp_test_lib.sh.in
+++ b/src/lib/testutils/dhcp_test_lib.sh.in
@@ -551,9 +551,10 @@ get_reconfigs() {
     ${_GET_RECONFIG_ERRORS##*[! ]}
 }
 
+# Remove the given directories or files if they exist.
 remove_if_exists() {
-    while test ${#} -gt 1; do
-        if test -n "${1}"; then
+    while test ${#} -gt 0; do
+        if test -e "${1}"; then
             rm -rf "${1}"
         fi
         shift