X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fwin32-fd-test;h=43f3b8064fea3d6e55ed19ebf43b30f396adc4ea;hb=eb1d228dd8b9e6d1bcac3449d63a81dc0e884628;hp=099f2b362487c43a5922b016d86bd5bdcad9e5fd;hpb=b55b96be09da52aa6f03ad30e112de9aba76730f;p=bacula%2Fbacula

diff --git a/regress/tests/win32-fd-test b/regress/tests/win32-fd-test
old mode 100644
new mode 100755
index 099f2b3624..43f3b8064f
--- a/regress/tests/win32-fd-test
+++ b/regress/tests/win32-fd-test
@@ -4,6 +4,8 @@
 # --------------------
 #
 # * Get a working Windows OS on your network
+# * Set the proper environment variables for WIN32_xx at the end
+#   of your regress/config file
 # * Install strawberry perl version with msi 
 #   http://www.bacula.org/downloads/depkgs-mingw32/strawberry-perl-5.10.1.0.msi
 # * Install the latest version of Bacula FD
@@ -11,7 +13,13 @@
 #     regress/scripts/regress-win32.pl
 # * Execute the script on the Windows box
 #     perl regress-win32.pl
-# * Run this script with the proper config settings about WIN32
+#   Note, this is a server so the script just waits for Bacula
+#     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"
 JobName=win32
@@ -21,7 +29,11 @@ scripts/cleanup
 scripts/copy-test-confs
 cp scripts/win32-bacula-dir.conf bin/bacula-dir.conf
 
+change_jobname NightlySave $JobName
+start_test
+
 URL=http://$WIN32_ADDR:8091
+echo "Doing wgets ..."
 wget -qO $tmp/stop.log "$URL/stop"
 wget -qO $tmp/update.log "$URL/set_director_name?name=$HOST-dir;pass=$WIN32_PASSWORD"
 wget -qO $tmp/start.log "$URL/start"
@@ -30,8 +42,8 @@ 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"
 
-change_jobname NightlySave $JobName
-start_test
+# try to upgrade win32 binaries
+update_win32
       
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output
@@ -86,7 +98,7 @@ if [ $? != 0 ]; then
 fi
 
 # Compare with some weird files
-wget -qO $tmp/2.log "$URL/compare?source=$WIN32_FILE/weird_runcript;dest=$WIN32_FILE/restore/$DST/weird_runcript"
+wget -qO $tmp/2.log "$URL/compare?source=$WIN32_FILE/weird_runscript;dest=$WIN32_FILE/restore/$DST/weird_runscript"
 print_debug `cat $tmp/2.log`
 
 grep OK $tmp/2.log > /dev/null