From 7040b6c3efffe45fc2974d924b93b311f9f04920 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 20 Dec 2008 11:12:55 +0000
Subject: [PATCH] Updates

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8197 91ce42f0-d328-0410-95d8-f526ca767f89
---
 regress/scripts/create_sed               |   1 +
 regress/scripts/win32-bacula-dir.conf.in |  22 +++++-----------------
 regress/tests/copy-job-test              |   2 +-
 regress/tests/migration-job-test         |   3 ++-
 regress/tests/win32-test                 |   4 +++-
 regress/weird-files.tar.gz               | Bin 1957 -> 2029 bytes
 6 files changed, 12 insertions(+), 20 deletions(-)

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 09d1ebd486fdf534076682651a40270ed8c1cd51..0315a5ec453faa77e5a63dc90ed4c56c5f00276d 100644
GIT binary patch
literal 2029
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
GVEzj>kz-5%

literal 1957
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

-- 
2.39.2