Use tmp instead of /tmp

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

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index c7cd869d6e29400ebaabd48bd2a5931623dba6ed..30fe11e88bb220b46e7e44683266d92046a99c67 100755 (executable)
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -30,7 +30,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore current all
+restore where=${cwd}/tmp/bacula-restores current all
 yes
 wait
 messages
@@ -42,7 +42,7 @@ grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-diff -r build /tmp/bacula-restores${cwd}/build
+diff -r build tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index f163887039019b84b41d4cc08ce2c18985d3cfd6..01e925d6537313d80b96368a55030bc8421eb4d2 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -29,7 +29,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out  
-restore current all
+restore where=${cwd}/tmp/bacula-restores current all
 yes
 wait
 messages
@@ -41,7 +41,7 @@ grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-diff -r build /tmp/bacula-restores${cwd}/build
+diff -r build tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 820d0ed03c92725cd9004855c35e47a93adbdcc7..362d50591e545174d65d7d8c29e777f5e7e82200 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -20,6 +20,8 @@ echo " "
 bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
+status all
+status all
 messages
 @output tmp/log1.out
 label storage=File volume=TestVolume001
@@ -30,7 +32,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore
+restore where=${cwd}/tmp/bacula-restores
 5
 done
 yes
@@ -44,7 +46,7 @@ grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-diff -r build /tmp/bacula-restores${cwd}/build
+diff -r build tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "

diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index 77de8411f7f010f26177f5da3f5166aef99dd7c0..fd253e7e95367c3a8e56c1560f5d1ed1d566ccef 100755 (executable)
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -38,7 +38,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore
+restore where=${cwd}/tmp/bacula-restores
 7
 <${cwd}/tmp/restore-list
 
@@ -53,7 +53,7 @@ grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-diff -r tmp/build /tmp/bacula-restores${cwd}/tmp/build
+diff -r tmp/build tmp/bacula-restores${cwd}/tmp/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "

diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index 17676e51a26c319ed5ffdf4c62f2914c1ab9b638..73344ddc250a144503d309d0ebc7f8d20dc4897a 100755 (executable)
--- a/regress/tests/small-file-size-tape
+++ b/regress/tests/small-file-size-tape
@@ -10,7 +10,7 @@ scripts/cleanup-tape
 echo "${cwd}/build" >/tmp/file-list
 bin/drop_sqlite_tables
 bin/make_sqlite_tables
-out="/tmp/sed_tmp"
+out="tmp/sed_tmp"
 echo "s%# Maximum File Size%  Maximum File Size%g" >${out}
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed -f ${out} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
@@ -34,7 +34,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore current all
+restore where=${cwd}/tmp/bacula-restores current all
 yes
 wait
 messages
@@ -46,7 +46,7 @@ grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-diff -r build /tmp/bacula-restores${cwd}/build
+diff -r build tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 2c863669c855eac42e3849eeb3d7231b746f9b5b..9cc62ee0e530f0d1f3bc014477dc66fa87a14550 100755 (executable)
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -30,7 +30,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out   
-restore current all
+restore where=${cwd}/tmp/bacula-restores current all
 yes
 wait
 messages
@@ -42,7 +42,7 @@ grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-diff -r build /tmp/bacula-restores${cwd}/build
+diff -r build tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index f0b3ec8df15104056dee6a32f5a6748e8c4b6638..ce2b10cddc7d93df0dd31d3605027b9f82187b37 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -30,9 +30,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore
-5
-done
+restore where=${cwd}/tmp/bacula-restores current all
 yes
 wait
 messages
@@ -44,7 +42,7 @@ grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-diff -r build /tmp/bacula-restores${cwd}/build
+diff -r build tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index 89d742524d6786f37ccb8460248cae384f46c4d9..d32b9befabd1a01e48ad937caf0cd9dee7ff0119 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -48,14 +48,14 @@ messages
 @# now do several restores to ensure we cleanup between jobs
 @#
 @output /dev/null
-restore current all
+restore where=${cwd}/tmp/bacula-restores current all
 yes
 wait
-restore current all    
+restore where=${cwd}/tmp/bacula-restores current all
 yes
 wait
 @output tmp/log2.out
-restore current all    
+restore where=${cwd}/tmp/bacula-restores current all
 yes
 wait
 messages
@@ -67,7 +67,7 @@ grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-diff -r build /tmp/bacula-restores${cwd}/build
+diff -r build tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index a9e2c3010d3e0a087c71ae33439b03f0864b0241..401b9af3ba28d1bb4ca38992c01ca447bf927440 100755 (executable)
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -18,7 +18,7 @@ mtx -f /dev/sg0 unload
 echo "${cwd}/build" >/tmp/file-list
 bin/drop_sqlite_tables
 bin/make_sqlite_tables
-out="/tmp/sed_tmp"
+out="tmp/sed_tmp"
 echo "s%# Maximum File Size%  Maximum File Size%g" >${out}
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed -f ${out} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
@@ -44,7 +44,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore current all
+restore where=${cwd}/tmp/bacula-restores current all
 yes
 wait
 messages
@@ -56,7 +56,7 @@ grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
-diff -r build /tmp/bacula-restores${cwd}/build
+diff -r build tmp/bacula-restores${cwd}/build
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "