update configure

[bacula/bacula] / regress / scripts / functions

diff --git a/regress/scripts/functions b/regress/scripts/functions
index 5c3ed5b55af7620d20ca56459ede1f15ad913e8a..7395361cd503be1368fffabb39aedf8b0f8b7a6f 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -126,7 +126,7 @@ check_files_written()
     FILES=`awk '/FD Files Written:/ { last=$4 } END { print last }' $LOG`
 
     if [ "$NB" != "$FILES" ]; then
-        print_debug "Expect $NB files, get $FILES"
+        print_debug "ERROR: Expect $NB files, get $FILES"
         bstat=2
     fi
 }
@@ -172,7 +172,7 @@ run_bacula()
      cat ${tmp}/bconcmds | ${bin}/bconsole -c ${conf}/bconsole.conf
      return $?
    else
-     ${bin}/bacula start >/dev/null 2>&1
+     ${scripts}/bacula start >/dev/null 2>&1
      cat ${tmp}/bconcmds | ${bin}/bconsole -c ${conf}/bconsole.conf >/dev/null 2>&1
      return $?
    fi
@@ -225,9 +225,9 @@ bscan_libdbi()
 stop_bacula()
 {
    if test "$debug" -eq 1 ; then
-      ${bin}/bacula stop
+      ${scripts}/bacula stop
    else
-      ${bin}/bacula stop 2>&1 >/dev/null
+      ${scripts}/bacula stop 2>&1 >/dev/null
    fi
 }
 
@@ -399,6 +399,17 @@ disable_pluguins()
    done
 }
 
+update_win32()
+{
+   if [ -d $cwd/build/src/win32/release32   \
+     -a -d $cwd/build/src/win32/release64 ] \
+   || [ -d $cwd/release32 -a -d $cwd/release64 ]
+   then
+       echo -ne "Try to upgrade the FileDaemon:\t"
+       wget -qO - "$WIN32_ADDR:8091/install"
+   fi
+}
+
 debug_wait()
 {
   if test "x${REGRESS_WAIT}" = "x1"; then
@@ -508,10 +519,10 @@ dumps=${dumps:-"$cwd/dumps"}
 bin=${bin:-"$cwd/bin"}
 
 # Bacula scripts
-scripts=${scripts:-"$bin"}
+scripts=${scripts:-"$cwd/bin"}
 
 # Bacula conf files
-conf=${conf:-"$bin"}
+conf=${conf:-"$cwd/bin"}
 
 # Regress scripts
 rscripts=${rscripts:-"$cwd/scripts"}