From 0b87be81761a8146bf30af97cd76b169fc527e49 Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <marco.van.wieringen@bareos.com>
Date: Tue, 5 Feb 2013 14:25:38 +0100
Subject: [PATCH] Tweak regression cleanup.

---
 scripts/cleanup | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/cleanup b/scripts/cleanup
index ed71f39..d09a5bd 100755
--- a/scripts/cleanup
+++ b/scripts/cleanup
@@ -2,8 +2,12 @@
 #
 # Cleanup left over files -- both before and after test run
 #
+
+. ./config
 . scripts/functions
+
 cwd=`pwd`
+
 rm -rf ${tmp}/FileVolume*
 rm -rf ${tmp}/TestVolume001 ${tmp}bareos-restores ${tmp}/Small*
 rm -rf ${tmp}/sed_tmp ${tmp}/file-list
@@ -16,16 +20,15 @@ rm -rf ${tmp}disk-changer
 rm -f ${cwd}/bin/plugins/test-plugin-fd.so
 find . -name "gigaslam.gif" -exec rm -f {} \;
 
-
 # bin directory does not always exist
 if [ -d ${bin} ] ; then
   if [ -f ${bin}/bareos ] ; then
      ${bin}/bareos stop 2>&1 >/dev/null
   fi
   cd ${scripts}
-  ./drop_bareos_tables      >/dev/null 2>&1
-  ./make_bareos_tables      >/dev/null 2>&1
-  ./grant_bareos_privileges >/dev/null 2>&1
+  ./drop_bareos_tables ${DBTYPE} >/dev/null 2>&1
+  ./make_bareos_tables ${DBTYPE} >/dev/null 2>&1
+  ./grant_bareos_privileges ${DBTYPE} >/dev/null 2>&1
   cd ${cwd}
 fi