From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 7 Dec 2010 09:20:57 +0000 (+0100)
Subject: regress: Add update_win32 function to win32-fd-test
X-Git-Tag: Release-7.0.0~1278
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6fde1492b2723a2b439f20df35d03f768876fec4;p=bacula%2Fbacula

regress: Add update_win32 function to win32-fd-test
---

diff --git a/regress/scripts/functions b/regress/scripts/functions
index f0baea1214..b01633d531 100644
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -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 -f $cwd/release64 ]
+   then
+       echo "Try to upgrade the FileDaemon"
+       wget -qO - "$WIN32_ADDR:8091/install" | grep OK >/dev/null
+   fi
+}
+
 debug_wait()
 {
   if test "x${REGRESS_WAIT}" = "x1"; then
diff --git a/regress/tests/win32-fd-test b/regress/tests/win32-fd-test
index 5931443998..43f3b8064f 100755
--- a/regress/tests/win32-fd-test
+++ b/regress/tests/win32-fd-test
@@ -17,6 +17,8 @@
 #     to run and connect to it.
 # * Create c:\regress\test on the Windows machine
 # * Allow ports through the Win firewall for perl 8091 and bacula-fd 9102
+# * If you put bacula binaries in release32 and release64, the script will
+#   update binaries
 # * Run win32-fd-test regression
 #
 TestName="win32-fd-test"
@@ -39,8 +41,9 @@ wget -qO $tmp/start.log "$URL/start"
 wget -qO $tmp/init1.log "$URL/init_attrib_test?source=$WIN32_FILE"
 wget -qO $tmp/init2.log "$URL/init_weird_runscript_test?source=$WIN32_FILE"
 wget -qO $tmp/clean.log "$URL/cleandir?source=$WIN32_FILE/restore"
-echo "Done wgets ..."
 
+# try to upgrade win32 binaries
+update_win32
       
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output