Fix FileSet options + add gigaslam tests

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

diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in
index 81e520fc23a00a0aa9398b7b3fc99ba09f4efbc2..6e0cb2fafdc8d0da8cbcf12a59450e16094db027 100644 (file)
--- a/regress/scripts/new-test-bacula-dir.conf.in
+++ b/regress/scripts/new-test-bacula-dir.conf.in
@@ -156,7 +156,8 @@ FileSet {
   Name = "SparseSet"
   Include {
     Options {
-      signature=MD5 sparse=yes
+      signature=MD5
+      sparse=yes
     }
     File = </tmp/file-list
   }
@@ -166,7 +167,8 @@ FileSet {
   Name = "CompressedSet"
   Include {
     Options {
-      signature=MD5 compression=GZIP 
+      signature=MD5 
+      compression=GZIP 
     }
     File = </tmp/file-list
   }
@@ -176,7 +178,8 @@ FileSet {
   Name = "SparseCompressedSet"
   Include {
     Options {
-      signature=MD5 compression=GZIP
+      signature=MD5 
+      compression=GZIP
       sparse=yes
     }
     File = </tmp/file-list
@@ -191,15 +194,15 @@ FileSet {
 #  and incremental backups other days
 Schedule {
   Name = "WeeklyCycle"
-  Run = Full 1st sun at 1:05
-  Run = Differential 2nd-5th sun at 1:05
-  Run = Incremental mon-sat at 1:05
+  Run = Level=Full 1st sun at 1:05
+  Run = Level=Differential 2nd-5th sun at 1:05
+  Run = Level=Incremental mon-sat at 1:05
 }
 
 # This schedule does the catalog. It starts after the WeeklyCycle
 Schedule {
   Name = "WeeklyCycleAfterBackup"
-  Run = Full sun-sat at 1:10
+  Run = Level=Full sun-sat at 1:10
 }
 
 # This is the backup of the catalog

diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in
index b1793a636f55e44ba13abcf6cb2c8625960dc2f0..59dbc6f287bc7ef1c5ee6856638178dee0977bd2 100644 (file)
--- a/regress/scripts/test-bacula-dir.conf.in
+++ b/regress/scripts/test-bacula-dir.conf.in
@@ -172,15 +172,15 @@ FileSet {
 #  and incremental backups other days
 Schedule {
   Name = "WeeklyCycle"
-  Run = Full 1st sun at 1:05
-  Run = Differential 2nd-5th sun at 1:05
-  Run = Incremental mon-sat at 1:05
+  Run = Level=Full 1st sun at 1:05
+  Run = Level=Differential 2nd-5th sun at 1:05
+  Run = Level=Incremental mon-sat at 1:05
 }
 
 # This schedule does the catalog. It starts after the WeeklyCycle
 Schedule {
   Name = "WeeklyCycleAfterBackup"
-  Run = Full sun-sat at 1:10
+  Run = Level=Full sun-sat at 1:10
 }
 
 # This is the backup of the catalog

diff --git a/regress/tests/gigaslam-sparse-test b/regress/tests/gigaslam-sparse-test
index 00223111a288f0edc2da196106602b0178364d3a..38ebd494375bc3d8d3e7405deb1ed3c098006c57 100755 (executable)
--- a/regress/tests/gigaslam-sparse-test
+++ b/regress/tests/gigaslam-sparse-test
@@ -3,10 +3,10 @@
 # Run a simple backup of the Bacula build directory using the Sparse option
 #   then restore it.
 #
-TestName="sparse-test"
+TestName="gigaslam-sparse-test"
 JobName=SparseTest
 . scripts/functions
-set_debug 1
+set_debug 0
 
 cwd=`pwd`
 scripts/cleanup
@@ -49,9 +49,13 @@ END_OF_DATA
 
 run_bacula
 check_for_zombie_jobs storage=File 
-ls -l ${cwd}/tmp
 stop_bacula
 
+size=`du ${cwd}/tmp/bacula-restores/${cwd}/build/src/tools/gigaslam.gif | cut -f 1`
+if [ $size -gt 120 ]; then
+   echo "========== restored sparse file gigaslam.gif too big ========="
+fi
+
 check_two_logs
 check_restore_diff
 end_test

diff --git a/regress/tests/sparse-encrypt-test b/regress/tests/sparse-encrypt-test
index 0003e4871883ee6de1ac9a0563e68cd1cf3a43b2..5a20ae6b5c3cdcbb178b8111968fecb772f6165e 100755 (executable)
--- a/regress/tests/sparse-encrypt-test
+++ b/regress/tests/sparse-encrypt-test
@@ -3,10 +3,10 @@
 # Run a simple backup (with encryption) of the Bacula build directory
 #   then verify the signatures.
 #
-TestName="data-encrypt-test"
+TestName="sparse-encrypt-test"
 JobName=Crypto
 . scripts/functions
-set_debug 1
+set_debug 0
 
 scripts/cleanup
 scripts/copy-crypto-confs
@@ -52,6 +52,11 @@ sleep 2
 check_for_zombie_jobs storage=File 
 stop_bacula
 
+size=`du ${cwd}/tmp/bacula-restores/${cwd}/build/src/tools/gigaslam.gif | cut -f 1`
+if [ $size -gt 120 ]; then
+   echo "========== restored sparse file: gigaslam.gif too big ========="
+fi
+
 check_two_logs
 check_restore_diff
 end_test