From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 24 Sep 2003 13:44:01 +0000 (+0000)
Subject: Use tmp instead of /tmp
X-Git-Tag: Release-1.32~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1f49055cf0914f5b3597fe166823d2a631d19c1f;p=bacula%2Fbacula

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 c7cd869d6e..30fe11e88b 100755
--- 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 f163887039..01e925d653 100755
--- 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 820d0ed03c..362d50591e 100755
--- 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 77de8411f7..fd253e7e95 100755
--- 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 17676e51a2..73344ddc25 100755
--- 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 2c863669c8..9cc62ee0e5 100755
--- 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 f0b3ec8df1..ce2b10cddc 100755
--- 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 89d742524d..d32b9befab 100755
--- 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 a9e2c3010d..401b9af3ba 100755
--- 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 " "