1 files changed, 13 insertions, 5 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 37b7bf664c..ef8efc04e4 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -30,7 +30,7 @@ if os.getenv('VALGRIND') then
   prepend_argv = {'valgrind', '-q', '--tool=memcheck',
                   '--leak-check=yes', '--track-origins=yes',
                   '--show-possibly-lost=no',
-                  '--suppressions=.valgrind.supp',
+                  '--suppressions=src/.valgrind.supp',
                   '--log-file='..log_file}
   if os.getenv('GDB') then
     table.insert(prepend_argv, '--vgdb=yes')
@@ -345,10 +345,18 @@ local function rmdir(path)
   end
   for file in lfs.dir(path) do
     if file ~= '.' and file ~= '..' then
-      local ret, err = os.remove(path..'/'..file)
-      if not ret then
-        error('os.remove: '..err)
-        return nil
+      local abspath = path..'/'..file
+      if lfs.attributes(abspath, 'mode') == 'directory' then
+        local ret = rmdir(abspath)  -- recurse
+        if not ret then
+          return nil
+        end
+      else
+        local ret, err = os.remove(abspath)
+        if not ret then
+          error('os.remove: '..err)
+          return nil
+        end
       end
     end
   end