From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 20 Dec 2008 11:12:55 +0000 (+0000)
Subject: Updates
X-Git-Tag: Release-3.0.0~446
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=07daebd6aa15d60d16f8ce0ce00b2ecc63da8836;p=bacula%2Fbacula

Updates

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8197 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/regress/scripts/create_sed b/regress/scripts/create_sed
index 9baebcdca3..d78de95aa3 100755
--- a/regress/scripts/create_sed
+++ b/regress/scripts/create_sed
@@ -72,6 +72,7 @@ echo "s%@bdate@%${bdate}%g" >>${out}
 echo "s%@libdbi@%${libdbi}%g" >>${out}
 echo "s%@win32_client@%${WIN32_CLIENT}%g" >>${out}
 echo "s%@win32_addr@%${WIN32_ADDR}%g" >>${out}
+echo "s%@win32_store_addr@%${WIN32_STORE_ADDR}%g" >>${out}
 echo "s%@win32_file@%${WIN32_FILE}%g" >>${out}
 echo "s%@win32_port@%${WIN32_PORT}%g" >>${out}
 echo "s%@win32_password@%${WIN32_PASSWORD}%g" >>${out}
diff --git a/regress/scripts/win32-bacula-dir.conf.in b/regress/scripts/win32-bacula-dir.conf.in
index d8cbe04407..54bcca711b 100644
--- a/regress/scripts/win32-bacula-dir.conf.in
+++ b/regress/scripts/win32-bacula-dir.conf.in
@@ -57,7 +57,7 @@ FileSet {
   Include { 
      Options { 
         signature=MD5; portable=no  
-         compression=GZIP
+#      compression=GZIP
      }
      File = "@win32_file@"
   }
@@ -88,28 +88,16 @@ Client {
   Maximum Concurrent Jobs = 4
 }
 
-Client {
-  Name = localhost-fd
-  Address = localhost
-  FDPort = @fdport@
-  Catalog = MyCatalog
-  Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"
-  File Retention = 30d                # 30 days
-  Job Retention = 180d                # six months
-  AutoPrune = yes                     # Prune expired Jobs/Files
-  Maximum Concurrent Jobs = 4
-}
-
 
-# Definition of DDS tape storage device
+# Definition of File storage device
 Storage {
   Name = File
-  Address = @hostname@-sd            # N.B. Use a fully qualified name here
+  Address = @win32_store_addr@       # N.B. Use a fully qualified name here
   SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
-  Device = File                      # must be same as Device in Storage daemon
+  Device = FileStorage               # must be same as Device in Storage daemon
   Media Type = File                  # must be same as MediaType in Storage daemon
-  AutoChanger = yes
+#  AutoChanger = yes
   Maximum Concurrent Jobs = 4
 }
 
diff --git a/regress/tests/copy-job-test b/regress/tests/copy-job-test
index a157eae40e..7724cac352 100755
--- a/regress/tests/copy-job-test
+++ b/regress/tests/copy-job-test
@@ -48,7 +48,7 @@ list volumes
 run job=copy-job yes
 wait
 messages
-purge volume=FileVolume001
+@#purge volume=FileVolume001
 list jobs 
 list volumes
 wait
diff --git a/regress/tests/migration-job-test b/regress/tests/migration-job-test
index 2fc38a8509..1115ef0910 100755
--- a/regress/tests/migration-job-test
+++ b/regress/tests/migration-job-test
@@ -29,7 +29,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output
 messages
 @$out ${cwd}/tmp/log1.out
-setdebug level=100 storage=File
+setdebug level=000 storage=File
 label storage=File volume=FileVolume001 Pool=Default
 label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0
 label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0
@@ -48,6 +48,7 @@ messages
 @# purge volume=FileVolume001
 list jobs 
 list volumes
+list joblog jobid=6
 wait
 @#
 @# Now do another backup, but level Incremental
diff --git a/regress/tests/win32-test b/regress/tests/win32-test
index 1e847b4ac8..9f1568b62c 100755
--- a/regress/tests/win32-test
+++ b/regress/tests/win32-test
@@ -22,6 +22,7 @@ status all
 status all
 messages
 label storage=File volume=TestVolume001
+setdebug level=100 dir
 run job=$JobName storage=File yes
 wait
 messages
@@ -29,7 +30,8 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select storage=File
+setdebug level=400 trace=1 client=Tibs
+restore where=c:/tmp/xxx select storage=File
 unmark *
 mark *
 done
diff --git a/regress/weird-files.tar.gz b/regress/weird-files.tar.gz
index 09d1ebd486..0315a5ec45 100644
Binary files a/regress/weird-files.tar.gz and b/regress/weird-files.tar.gz differ