From: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed, 9 Sep 2009 14:44:52 +0000 (+0200)
Subject: Update the new exclude-dir-test with multiple Include {} section
X-Git-Tag: Release-7.0.0~2633^2~16^2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8bc694a070f608014fa1e26cdc5dd9030c5d3c41;p=bacula%2Fbacula

Update the new exclude-dir-test with multiple Include {} section
and different Exclude Dir Contain directive.
---

diff --git a/regress/tests/exclude-dir-test b/regress/tests/exclude-dir-test
index 7cea3dc7c2..6cfacc7057 100755
--- a/regress/tests/exclude-dir-test
+++ b/regress/tests/exclude-dir-test
@@ -10,8 +10,30 @@ JobName=exclude-dir
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-test-confs
-echo "${cwd}/build" >${cwd}/tmp/file-list
-sed 's/Include {/Include { Exclude Dir Containing = ".nobkp"/' $conf/bacula-dir.conf > $tmp/1
+cat >> $conf/bacula-dir.conf <<EOF
+FileSet {
+  Name = "ExcludeDir"
+  Include { 
+    Exclude Dir Containing = ".nobkp"
+    Options {
+      signature=MD5
+      compression=GZIP
+    }
+    File = "$cwd/build"
+  }
+  Include { 
+    Exclude Dir Containing = "bacula-dir.conf"
+    Options {
+      signature=MD5
+      compression=GZIP
+    }
+    File = "$conf"
+    File = "$rscripts"
+    File = "$cwd/build/po"
+  }
+}
+EOF
+sed 's/FileSet="CompressedSet"/FileSet=ExcludeDir/' $conf/bacula-dir.conf >$tmp/1
 cp -f $tmp/1 $conf/bacula-dir.conf
 change_jobname CompressedTest $JobName
 start_test
@@ -55,4 +77,24 @@ if [ $? = 0 ]; then
     bstat=2
 fi
 
+# build/po is included 2 times with a different exclude file
+# we shouldn't see scripts and bin
+nb=$(grep -e 'build/po/fr.po$' $tmp/log3.out | wc -l)
+if [ $nb != 2 ]; then
+    print_debug "ERROR: Should see fr.po two times"
+    bstat=2
+fi
+
+grep $rscripts $tmp/log3.out > /dev/null
+if [ $? = 0 ]; then
+    print_debug "ERROR: Should not $rscripts in estimate output"
+    bstat=2
+fi
+
+grep $conf $tmp/log3.out > /dev/null
+if [ $? = 0 ]; then
+    print_debug "ERROR: Should not $conf in estimate output"
+    bstat=2
+fi
+
 end_test