ebl regexwher tests are ok

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

diff --git a/regress/scripts/bacula-dir.conf.regexwhere.in b/regress/scripts/bacula-dir.conf.regexwhere.in
index ffac01395c8774e9883d563519a076bb8b3c8da1..89aed77398e7ebc1dc5563b5ff2629074b84593a 100644 (file)
--- a/regress/scripts/bacula-dir.conf.regexwhere.in
+++ b/regress/scripts/bacula-dir.conf.regexwhere.in
@@ -1,16 +1,6 @@
-#
-# Default Bacula Director Configuration file
-#
-#  The only thing that MUST be changed is to add one or more
-#   file or directory names in the Include directive of the
-#   FileSet resource.
-#
-#  For Bacula release 1.39.27 (24 October 2006) -- debian testing/unstable
-#
-#  You might also want to change the default email address
-#   from root to your address.  See the "mail" and "operator"
-#   directives in the Messages resource.
-#
+# TODO
+# Orphaned buffer:  localhost-dir     40 bytes buf=80e9a70 allocated at dird_conf.c:1338
+# bacula-dir: dird.c:656 Hey something is wrong. p=0x135174768
 
 Director {                            # define myself
   Name = @hostname@-dir
@@ -24,10 +14,10 @@ Director {                            # define myself
   Messages = Standard
 }
 
-JobDefs {
-  Name = "DefaultJob"
+Job {
+  Name = "backup"
   Type = Backup
-  Level = Incremental
+  Level = Full
   Client = @hostname@-fd 
   FileSet = FS_TESTJOB
   Storage = File
@@ -52,6 +42,7 @@ JobDefs {
   FileSet="FS_TESTJOB"
   Messages = Standard
   Pool = Default
+  Replace = Always
 }
 
 Job {
@@ -65,88 +56,39 @@ Job {
   JobDefs = DefaultRestore
   add prefix = /tmp/bacula-restore
   add suffix = .old
-  strip prefix = /build 
+  strip prefix = /build
 }
 
 Job {
   Name = JobC
-  JobDefs = DefaultRestoreWhere
-}
-
-JobDefs {
-  Name = "DefaultRestoreWhere"
-  Type = Restore
-  Storage = File
-  Client=localhost-fd 
-  FileSet="FS_TESTJOB"
-  Messages = Standard
-  Pool = Default
-  Where = /tmp/bacula-restores
-}
-
-JobDefs {
-  Name = "DefaultRestoreRegexWhere"
-  Type = Restore
-  Storage = File
-  Client=localhost-fd 
-  FileSet="FS_TESTJOB"
-  Messages = Standard
-  Pool = Default
-  RegexWhere = !po$!old.po!
-}
-
-JobDefs {
-  Name = "DefaultRestoreOther"
-  Type = Restore
-  Storage = File
-  Client=localhost-fd 
-  FileSet="FS_TESTJOB"
-  Messages = Standard
-  Pool = Default
-  add suffix = .old 
-}
-
-Job {
-  Name = Job1
-  JobDefs = DefaultRestoreWhere
-  RegexWhere = !po$!old.po!
+  JobDefs = DefaultRestore
+  Where = /tmp/bacula-restore
 }
 
 Job {
-  Name = Job2
-  JobDefs = DefaultRestoreWhere
-  add suffix = .old
+  Name = JobD
+  JobDefs = DefaultRestore
+  RegexWhere = "doesnt work"
 }
 
 Job {
-  Name = Job3
-  JobDefs = DefaultRestoreRegexWhere
-  Where = /tmp/bacula-restore
+  Name = JobE
+  JobDefs = DefaultRestore
+  RegexWhere = "/BUILD/tmp/i,!po/!!"
 }
 
-# TODO
-# Orphaned buffer:  localhost-dir     40 bytes buf=80e9a70 allocated at dird_conf.c:1338
-# bacula-dir: dird.c:656 Hey something is wrong. p=0x135174768
 Job {
-  Name = Job4
-  JobDefs = DefaultRestoreRegexWhere
-  add suffix = .old
+  Name = JobF
+  JobDefs = DefaultRestore
+  RegexWhere = "/something witch doesn't match/tmp/i"
 }
 
 Job {
-  Name = Job5
-  JobDefs = DefaultRestoreOther
+  Name = JobG
+  JobDefs = DefaultRestore
   Where = /tmp/bacula-restore
 }
 
-Job {
-  Name = Job6
-  JobDefs = DefaultRestoreOther
-  add suffix = .temp
-}
-
-
-
 
 # Client (File Services) to backup
 Client {

diff --git a/regress/tests/runscript-test b/regress/tests/runscript-test
index 62c449a62755d1186e675a921d402ff293d0326d..434e3c1c964b4929c89a4950cb9da7fd693b64f0 100755 (executable)
--- a/regress/tests/runscript-test
+++ b/regress/tests/runscript-test
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  Test if Bacula can automatically create a Volume label.
+#  Test RunScript
 #
 
 TestName="runscript-test"