Add tcpwrappers config + improve Incremental test

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

diff --git a/regress/scripts/regress-config b/regress/scripts/regress-config
index a1a3f2b85f5bbaf591e0b30e55c72eee7abda7b9..7ef93d84b0231fac4d181e789de1ac5d9ff99127 100755 (executable)
--- a/regress/scripts/regress-config
+++ b/regress/scripts/regress-config
@@ -16,6 +16,6 @@ CFLAGS="-g -O2 -Wall" \
     --with-job-email=$2 \
     $3 \
     --with-baseport=8101 \
-    --with-tcp-wrappers
+    $4
 
 exit 0

diff --git a/regress/scripts/setup b/regress/scripts/setup
index 0b01c0928a0adbb765af48afe972e8b46c6d0657..1f8ba1b5d7a862a2a5f34fcae43ad3a2dbc60f91 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -3,9 +3,9 @@
 # Script to setup running Bacula regression tests
 #
 cwd=`pwd`
-if [ $# != 3 ] ; then
+if [ $# != 4 ] ; then
    echo "Incorrect number of arguments. Got $#. Need:"
-   echo "setup bacula-src email-address --with-DBNAME"
+   echo "setup bacula-src email-address --with-DBNAME --with-tcp-wrappers"
    echo " "
    exit 1
 fi
@@ -22,7 +22,7 @@ cp scripts/regress-config build
 cd build
 rm -f Makefile config.cache
 # Run Bacula configuration, make, install
-./regress-config ${cwd} $2 $3
+./regress-config ${cwd} $2 $3 $4
 make
 make install
 cp src/tools/testls ../bin

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index 7cc54ccf8278ecd20788d502b25608eb5c083921..0701cf2ba933ca32b8949fa30577f39c58f44d17 100755 (executable)
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -33,14 +33,93 @@ messages
 quit
 END_OF_DATA
 scripts/check_for_zombie_jobs storage=File
+#
+# Now create two new files to be restored later
+#
+sleep 1
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
-echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
+cp -f ${cwd}/tmp/build/dird.c ${cwd}/tmp/build/ficheriro2.txt
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
 @# Force Incremental on the second Volume
 update volume=TestVolume001 VolStatus=Used
+run level=Differential job=CompressedTest yes
+wait
+messages
+quit
+END_OF_DATA
+sleep 1
+touch ${cwd}/tmp/build/ficheriro1.txt
+touch ${cwd}/tmp/build/ficheriro2.txt
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+@output /dev/null
+messages
+@output tmp/log1.out
+run level=Incremental job=CompressedTest yes
+wait
+messages
+quit
+END_OF_DATA
+sleep 1
+cd ${cwd}/tmp/build
+cp -f ficheriro2.txt 1
+sed "s%a%b%g" 1 >ficheriro2.txt
+rm -f 1
+cd ${cwd}
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+@output /dev/null
+messages
+@output tmp/log1.out
+run level=Differential job=CompressedTest yes
+wait
+messages
+quit
+END_OF_DATA
+sleep 1
+touch ${cwd}/tmp/build/ficheriro1.txt
+touch ${cwd}/tmp/build/ficheriro2.txt
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+@output /dev/null
+messages
+@output tmp/log1.out
+run level=Incremental job=CompressedTest yes
+wait
+messages
+quit
+END_OF_DATA
+sleep 1
+touch ${cwd}/tmp/build/ficheriro1.txt
+touch ${cwd}/tmp/build/ficheriro2.txt
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+@output /dev/null
+messages
+@output tmp/log1.out
+run level=Incremental job=CompressedTest yes
+wait
+messages
+quit
+END_OF_DATA
+sleep 1
+touch ${cwd}/tmp/build/ficheriro1.txt
+touch ${cwd}/tmp/build/ficheriro2.txt
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+@output /dev/null
+messages
+@output tmp/log1.out
+run level=Incremental job=CompressedTest yes
+wait
+messages
+quit
+END_OF_DATA
+sleep 1
+touch ${cwd}/tmp/build/ficheriro1.txt
+touch ${cwd}/tmp/build/ficheriro2.txt
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+@output /dev/null
+messages
+@output tmp/log1.out
 run level=Incremental job=CompressedTest yes
 wait
 messages