regress: add get_resource to function.pm

[bacula/bacula] / regress / scripts / cleanup

diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup
index b74b91a084036573b665687c944335389531131f..d63a52e1bfc8e158f139cadaa3c09a73c3e07e6b 100755 (executable)
--- a/regress/scripts/cleanup
+++ b/regress/scripts/cleanup
@@ -9,15 +9,18 @@ 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
+rm -rf ${working}/*.trace ${working}/*.traceback ${working}/*.bactrace 
 rm -rf ${tmp}disk-changer
 find . -name "gigaslam.gif" -exec rm -f {} \;
 
 
 # bin directory does not always exist
 if [ -d ${bin} ] ; then
-  ${bin}/bacula stop 2>&1 >/dev/null
+  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