Backport from BEE

[bacula/bacula] / regress / scripts / cleanup

diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup
index b52f6e381dd883a4bf9a61962e1a0bc8022c9536..4f8ccbb765763aee66e624632c5debfe4c1c41d6 100755 (executable)
--- a/regress/scripts/cleanup
+++ b/regress/scripts/cleanup
@@ -2,18 +2,34 @@
 #
 # Cleanup left over files -- both before and after test run
 #
-rm -rf /tmp/FileVolume* tmp/FileVolume*  
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores /tmp/Small*
-rm -rf /tmp/sed_tmp /tmp/file-list
-rm -rf tmp/*
-rm -rf working/log tmp/TEST-*
-rm -rf working/*.bsr
-rm -rf /tmp/disk-changer
+. scripts/functions
+cwd=`pwd`
+rm -rf ${tmp}/FileVolume*
+rm -rf ${tmp}/TestVolume001 ${tmp}bacula-restores ${tmp}/Small*
+rm -rf ${tmp}/sed_tmp ${tmp}/file-list
+rm -rf ${tmp}/*
+rm -rf ${working}/log ${tmp}/TEST-*
+rm -rf ${working}/log ${tmp}/Backup-*
+rm -rf ${working}/*.bsr ${working}/log*.sd
+rm -rf ${working}/*.trace ${working}/*.traceback ${working}/*.lockdump 
+rm -rf ${working}/@*
+rm -rf ${tmp}disk-changer
+rm -f ${cwd}/bin/plugins/test-plugin-fd.so
 find . -name "gigaslam.gif" -exec rm -f {} \;
 
-bin/bacula stop 2>&1 >/dev/null
-cd bin
-./drop_bacula_tables >/dev/null 2>&1
-./make_bacula_tables >/dev/null 2>&1
-./grant_bacula_privileges >/dev/null 2>&1
-cd ..
+
+# bin directory does not always exist
+if [ -d ${bin} ] ; then
+  if [ -f ${bin}/bacula ] ; then
+     ${bin}/bacula stop 2>&1 >/dev/null
+  fi
+  cd ${scripts}
+  ./drop_bacula_tables      >/dev/null 2>&1
+  ./make_bacula_tables      >/dev/null 2>&1
+  ./grant_bacula_privileges >/dev/null 2>&1
+  cd ${cwd}
+fi
+
+if [ x$USE_VTAPE = xyes ]; then
+   rm -rf ${working}/ach
+fi