regress: make truncate-test check for wrongly truncating an already truncated volume

[bacula/bacula] / regress / tests / encrypt-bug-test

diff --git a/regress/tests/encrypt-bug-test b/regress/tests/encrypt-bug-test
index 0bba2c6185626a869c27371c5b44618c382c961a..c6c810b31c1f566d5c5a2319614b111103856633 100755 (executable)
--- a/regress/tests/encrypt-bug-test
+++ b/regress/tests/encrypt-bug-test
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # Run a simple backup of untitled15.jpg that fails to
 #  restore properly in bug #763 
@@ -6,27 +11,28 @@
 TestName="encrypt-bug-test"
 JobName=Crypto-bug
 . scripts/functions
-set_debug 0
 
 scripts/cleanup
 scripts/copy-crypto-confs
-echo "${cwd}/encrypt-bug.jpg" >/tmp/file-list
-echo "${cwd}/encrypt-bug.jpg" >${cwd}/tmp/restore-list
-echo "${cwd}/encrypt-bug.txt" >>/tmp/file-list
-echo "${cwd}/encrypt-bug.txt" >>${cwd}/tmp/restore-list
-files="encrypt-bug.jpg encrypt-bug.txt"
+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
+   cp -p ${cwd}/encrypt-bug*.* ${cwd}/tmp/build
 done
 
 change_jobname NightlySave $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
-@$out /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@output /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=File volume=TestVolume001
 setdebug level=100 fd
 run job=$JobName yes
@@ -35,7 +41,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 setdebug level=100 fd
 restore where=${cwd}/tmp/bacula-restores storage=File
 5
@@ -44,7 +50,6 @@ done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
@@ -53,9 +58,8 @@ sleep 2
 check_for_zombie_jobs storage=File 
 stop_bacula
 
-du -s build
-du -s tmp/bacula-restores/
-
+#du -s build
+#du -s ${cwd}/tmp/bacula-restores/
 
 check_two_logs
 diff ${cwd}/tmp/build ${cwd}/tmp/bacula-restores/${cwd} 2>&1 >/dev/null