Update

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

diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index 5d413d9e8f8fc68f322d49da0e6da598ccce9ba1..783c887981df4aa8754f315fd9c0e015117fd3f1 100755 (executable)
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -11,6 +11,7 @@ tests/bextract-test
 tests/bscan-test
 tests/bsr-opt-test
 tests/compressed-test
+tests/compressed-encrypt-test
 tests/concurrent-jobs-test
 tests/data-encrypt-test
 #tests/sparse-encrypt-test

diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in
index 6e0cb2fafdc8d0da8cbcf12a59450e16094db027..bd0f6dc57634d597450767bd06216c3306432819 100644 (file)
--- a/regress/scripts/new-test-bacula-dir.conf.in
+++ b/regress/scripts/new-test-bacula-dir.conf.in
@@ -40,20 +40,6 @@ Job {
   SpoolData=yes
 }
 
-Job {
-  Name = "Crypto"
-  Type = Backup
-  Client=@hostname@-fd 
-  FileSet="SparseCompressedSet"
-  Storage = File
-  Messages = Standard
-  Pool = Default
-  Write Bootstrap = "@working_dir@/NightlySave.bsr"
-  Maximum Concurrent Jobs = 4
-  SpoolData=yes
-}
-
-
 Job {
   Name = "MonsterSave"
   Type = Backup

diff --git a/regress/tests/bscan-fast-tape b/regress/tests/bscan-fast-tape
index fcb7e921bacb608aae6f2bb294844b28c69923d9..2c8121896dffe33320ad3cd25e7752192eb3429d 100755 (executable)
--- a/regress/tests/bscan-fast-tape
+++ b/regress/tests/bscan-fast-tape
@@ -8,7 +8,7 @@
 TestName="bscan-tape"
 JobName=bscantape
 . scripts/functions
-set_debug 1
+set_debug 0
 
 copy_tape_confs
 

diff --git a/regress/tests/compress-encrypt-test b/regress/tests/compress-encrypt-test
new file mode 100755 (executable)
index 0000000..ac5d9b5
--- /dev/null
+++ b/regress/tests/compress-encrypt-test
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# Run a simple backup with encryption and compression of the Bacula build directory
+#   then verify the signatures.
+#
+TestName="compressed-encrypt-test"
+JobName=CompressedTest
+. scripts/functions
+set_debug 1
+
+scripts/cleanup
+scripts/copy-crypto-confs
+echo "${cwd}/build" >/tmp/file-list
+
+start_test
+
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
+messages
+@$out tmp/log1.out
+label storage=File volume=TestVolume001
+setdebug level=10 fd
+run job=$JobName yes
+wait
+messages
+list volumes
+@# 
+@# now do a restore
+@#
+@$out tmp/log2.out
+@# setdebug level=0 fd
+restore where=${cwd}/tmp/bacula-restores storage=File
+5
+mark *
+done
+yes
+wait
+messages
+@$out
+quit
+END_OF_DATA
+
+run_bacula
+sleep 2
+check_for_zombie_jobs storage=File 
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test

diff --git a/regress/tests/data-encrypt-test b/regress/tests/data-encrypt-test
index 20e868b05583d19feea2c3c75e0cecfbb892f288..16f4e6a5b2a3fea7ac4e9e9ddf2473201d9e9ef4 100755 (executable)
--- a/regress/tests/data-encrypt-test
+++ b/regress/tests/data-encrypt-test
@@ -1,7 +1,8 @@
 #!/bin/sh
 #
-# Run a simple backup (with encryption) of the Bacula build directory
-#   then verify the signatures.
+# Run a simple backup with encryption and no other options 
+#    (i.e. no compression and no sparse handling) of the 
+#    Bacula build directory.
 #
 TestName="data-encrypt-test"
 JobName=Crypto
@@ -12,6 +13,7 @@ scripts/cleanup
 scripts/copy-crypto-confs
 echo "${cwd}/build" >/tmp/file-list
 
+change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
@@ -44,6 +46,10 @@ sleep 2
 check_for_zombie_jobs storage=File 
 stop_bacula
 
+du -s build
+du -s tmp/bacula-restores/
+
+
 check_two_logs
 check_restore_diff
 end_test

diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test
index aa00d0ce893f2888722f760e9e70d4d5f8fb1c26..ac782cab20de841c7c01120b818d62cdc25fba6f 100755 (executable)
--- a/regress/tests/migration-volume-test
+++ b/regress/tests/migration-volume-test
@@ -8,7 +8,7 @@
 TestName="migration-volume-test"
 JobName=MigVolBackup
 . scripts/functions
-set_debug 1 
+set_debug 0 
 
 . config.out
 
@@ -89,6 +89,8 @@ run_bacula
 check_for_zombie_jobs storage=File
 stop_bacula
 
+exit
+
 check_two_logs
 check_restore_diff
 end_test

diff --git a/regress/tests/restore-seek-tape b/regress/tests/restore-seek-tape
index b86b75d9e11473a7663783847e40c582aaba8fb3..fe3fe3c42b8bf6e6ce43b6e98f4a00fdaf0ec4dc 100755 (executable)
--- a/regress/tests/restore-seek-tape
+++ b/regress/tests/restore-seek-tape
@@ -9,7 +9,7 @@
 TestName="restore-seek-tape"
 JobName=restore-tape-seek
 . scripts/functions
-set_debug 1
+set_debug 0
 
 copy_tape_confs
 echo "${cwd}/tmp/build" >/tmp/file-list

diff --git a/regress/tests/sparse-encrypt-test b/regress/tests/sparse-encrypt-test
index 3893dae71ab8a2405e8077d1e55668b58db89db9..fdc88cc697956b18c20d10ac7d19b72f96e91df7 100755 (executable)
--- a/regress/tests/sparse-encrypt-test
+++ b/regress/tests/sparse-encrypt-test
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
-# Run a simple backup (with encryption) of the Bacula build directory
-#   then verify the signatures.
+# Run a simple backup with encryption and a real sparse file.
 #
 TestName="sparse-encrypt-test"
 JobName=Crypto
 . scripts/functions
-set_debug 1
+set_debug 0
 
 scripts/cleanup
 scripts/copy-crypto-confs

diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test
index 484fd958f14e861037fc647536a57d1a4e918a69..7c2c51ad6722258aee614654889740d3bcea23ad 100755 (executable)
--- a/regress/tests/two-volume-test
+++ b/regress/tests/two-volume-test
@@ -10,7 +10,7 @@
 TestName="two-volume-test"
 JobName=TwoVolume
 . scripts/functions
-set_debug 1
+set_debug 0
 . config.out
 
 cwd=`pwd`

diff --git a/regress/tests/win32-to-linux-tape b/regress/tests/win32-to-linux-tape
index 780c7dfb8ca412491397a5b6936428685c237075..5640e9f9eccaa5f5c4405ca1a835b0fb3f71d3a5 100755 (executable)
--- a/regress/tests/win32-to-linux-tape
+++ b/regress/tests/win32-to-linux-tape
@@ -7,7 +7,7 @@
 TestName="win32-to-linux-tape"
 JobName=AutoLabel
 . scripts/functions
-set_debug 1
+set_debug 0
 
 scripts/copy-win32-confs
 scripts/cleanup-tape