X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbsr-opt-test;h=9413a8c081fcbd344020433bb8ac0e33c8e0098e;hb=1e11e29bf661a26cef2419a31d82b6657370f0af;hp=677d45d8da1cde90aa25b5dc9ee33cf5f915bac8;hpb=45dc0d2f1f568fcc62526533adacde65df441837;p=bacula%2Fbacula diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test index 677d45d8da..9413a8c081 100755 --- a/regress/tests/bsr-opt-test +++ b/regress/tests/bsr-opt-test @@ -12,15 +12,15 @@ JobName=bsr-opt scripts/cleanup scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list +echo "${cwd}/build" >${cwd}/tmp/file-list change_jobname NightlySave $JobName start_test -cat <tmp/bconcmds +cat <${cwd}/tmp/bconcmds @$out /dev/null messages -@$out tmp/log1.out +@$out ${cwd}/tmp/log1.out label storage=File1 volume=TestVolume001 label storage=File1 volume=TestVolume002 update Volume=TestVolume001 MaxVolBytes=3000000 @@ -30,7 +30,7 @@ messages @# @# now do a restore @# -@$out tmp/log2.out +@$out ${cwd}/tmp/log2.out restore bootstrap=${cwd}/working/restore.bsr where=${cwd}/tmp/bacula-restores select storage=File1 unmark * cd ${cwd}/build/src/cats @@ -56,7 +56,7 @@ grep TestVolume002 working/restore.bsr 2>&1 >/dev/null bsrstat=$? check_two_logs -diff -r build/src/cats tmp/bacula-restores${cwd}/build/src/cats 2>&1 >/dev/null +diff -r build/src/cats ${cwd}/tmp/bacula-restores${cwd}/build/src/cats 2>&1 >/dev/null if [ $? != 0 -o $bsrstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " "