X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fencrypt-bug-test;h=93f2b2ef3502a4128ffddde955ab38badfbb0683;hb=ad3c10917d42eaf60ec218b2d4614e49f1f25f34;hp=9c9f468b270a3bd9c37fb551a16891cd92a5cfc3;hpb=2fbfed8e32a45bb27b4d9fef403a4e0bf246cf93;p=bacula%2Fbacula

diff --git a/regress/tests/encrypt-bug-test b/regress/tests/encrypt-bug-test
index 9c9f468b27..93f2b2ef35 100755
--- a/regress/tests/encrypt-bug-test
+++ b/regress/tests/encrypt-bug-test
@@ -6,29 +6,38 @@
 TestName="encrypt-bug-test"
 JobName=Crypto-bug
 . scripts/functions
-set_debug 1
 
 scripts/cleanup
 scripts/copy-crypto-confs
-echo "${cwd}/untitled15.jpg" >/tmp/file-list
+echo "${cwd}/encrypt-bug.jpg"   >${cwd}/tmp/file-list
+echo "${cwd}/encrypt-bug.jpg"   >${cwd}/tmp/restore-list
+echo "${cwd}/encrypt-bug.txt"  >>${cwd}/tmp/file-list
+echo "${cwd}/encrypt-bug.txt"  >>${cwd}/tmp/restore-list
+echo "${cwd}/encrypt-bug2.txt" >>${cwd}/tmp/file-list
+echo "${cwd}/encrypt-bug2.txt" >>${cwd}/tmp/restore-list
+files="encrypt-bug.jpg encrypt-bug.txt encrypt-bug2.txt"
+mkdir -p ${cwd}/tmp/build
+for i in ${files}; do
+   cp -p ${cwd}/encrypt-bug*.* ${cwd}/tmp/build
+done
 
 change_jobname NightlySave $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=File volume=TestVolume001
-@#setdebug level=10 fd
+setdebug level=100 fd
 run job=$JobName yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
-@#setdebug level=10 fd
+@$out ${cwd}/tmp/log2.out
+setdebug level=100 fd
 restore where=${cwd}/tmp/bacula-restores storage=File
 5
 mark *
@@ -46,9 +55,10 @@ check_for_zombie_jobs storage=File
 stop_bacula
 
 du -s build
-du -s tmp/bacula-restores/
+du -s ${cwd}/tmp/bacula-restores/
 
 
 check_two_logs
-check_restore_diff
+diff ${cwd}/tmp/build ${cwd}/tmp/bacula-restores/${cwd} 2>&1 >/dev/null
+dstat=$?
 end_test