Upgrade to 1.37 style Includes

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

diff --git a/regress/endtime b/regress/endtime
index 8a218b67fce690d95e3d87259abca514473da2da..faf419f70db19fbcc773e05c163554954d370290 100755 (executable)
--- a/regress/endtime
+++ b/regress/endtime
@@ -5,4 +5,8 @@ t = now()
 fn = open('time.out', 'r')
 s = fn.readline()     
 fn.close()
-print 'Total time: %d secs' % (t - float(s))
+diff = t - float(s)
+h = int(diff / 3600)
+m = int((diff - h * 3600) / 60)
+sec = diff - h * 3600 - m * 60
+print 'Total time = %d:%02d:%02d or %d secs' % (h, m, sec, t - float(s))

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index 9cbb557727f9db9e273dab90a22e5a96b16f06dd..865d7bf398fa674f9f0bba29ac20fd6a1ca9c902 100644 (file)
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -56,8 +56,8 @@ Job {
 # List of files to be backed up
 FileSet {
   Name = "Full Set"
-  Include = signature=MD5 { 
-    </tmp/file-list
+  Include { Options { signature=MD5 }
+    File =  </tmp/file-list
   }
 }
 

diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in
index d1c849f6d1adb584345340e5d46f252c8a35f0d4..a91b7c43900d7bdd958eb090ff921412d0dd6624 100644 (file)
--- a/regress/scripts/new-test-bacula-dir.conf.in
+++ b/regress/scripts/new-test-bacula-dir.conf.in
@@ -133,8 +133,8 @@ Job {
 # List of files to be backed up
 FileSet {
   Name = "Full Set"
-  Include = signature=MD5 { 
-    </tmp/file-list
+  Include {  Options { signature=MD5 }
+     File =  </tmp/file-list
   }
 }
 

diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in
index e13bef283861a13b0992ef3c78982383212e4bef..9752660b252fe18750ee2458d0ac89948c2b1fcc 100644 (file)
--- a/regress/scripts/test-bacula-dir.conf.in
+++ b/regress/scripts/test-bacula-dir.conf.in
@@ -133,29 +133,33 @@ Job {
 # List of files to be backed up
 FileSet {
   Name = "Full Set"
-  Include = signature=MD5 { 
-    </tmp/file-list
+  Include  { Options { signature=MD5 }
+    File = </tmp/file-list
   }
 }
 
 FileSet {
   Name = "SparseSet"
-  Include = signature=MD5 sparse=yes { 
-    </tmp/file-list
+  Include { Options { signature=MD5; sparse=yes }
+    File=</tmp/file-list
   }
 }
 
 FileSet {
   Name = "CompressedSet"
-  Include = signature=MD5 compression=GZIP { 
-    </tmp/file-list
+  Include {
+    Options { signature=MD5; compression=GZIP }
+    File =</tmp/file-list
   }
 }
 
 FileSet {
   Name = "SparseCompressedSet"
-  Include = signature=MD5 compression=GZIP { 
-    </tmp/file-list
+  Include {
+    Options {
+      signature=MD5; compression=GZIP
+    }
+    File= </tmp/file-list
   }
 }
 
@@ -181,8 +185,8 @@ Schedule {
 # This is the backup of the catalog
 FileSet {
   Name = "Catalog"
-  Include = signature=MD5 {
-     /home/kern/bacula/regress/bin/working/bacula.sql
+  Include { Options { signature=MD5 }
+     File=/home/kern/bacula/regress/bin/working/bacula.sql
   }
 }
 

diff --git a/regress/scripts/testa-bacula-dir.conf.in b/regress/scripts/testa-bacula-dir.conf.in
index 33701f7cda422e1e1a3e45791e090e6e5252744c..1e75eec944064582dbc6c54c676f731323bf6245 100644 (file)
--- a/regress/scripts/testa-bacula-dir.conf.in
+++ b/regress/scripts/testa-bacula-dir.conf.in
@@ -61,8 +61,8 @@ Job {
 # List of files to be backed up
 FileSet {
   Name = "Full Set"
-  Include = signature=SHA1 { 
-    </tmp/file-list
+  Include { Options { signature=SHA1 }
+    File =</tmp/file-list
   }
 }
 

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 8cabf0423ef2233c0a84e91e2abcbde9939849d6..50a20688693f93a9638a667503dd0f5424d00c83 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -13,8 +13,8 @@ echo " === Starting Backup Bacula Test at `date +%R:%S` ==="
 echo " === Starting Backup Bacula Test at `date +%R:%S` ===" >>working/log
 echo " "
 
-#bin/bacula start 2>&1 >/dev/null
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
+#bin/bacula start
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages