From: Kern Sibbald Date: Thu, 25 Sep 2003 08:57:23 +0000 (+0000) Subject: Make tests work on Solaris X-Git-Tag: Release-1.32~7 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=da2a233bb07ba58f4a79ed7cb317eef3efd8caf4;p=bacula%2Fbacula Make tests work on Solaris git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@712 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed index 7911e5d921..165a20484a 100755 --- a/regress/scripts/do_sed +++ b/regress/scripts/do_sed @@ -33,6 +33,9 @@ sed -f ${out} ${cwd}/scripts/test-console.conf.in >${cwd}/scripts/test-console.c sed -f ${out} ${cwd}/scripts/bacula-dir-tape.conf.in >${cwd}/scripts/bacula-dir-tape.conf sed -f ${out} ${cwd}/scripts/bacula-sd-tape.conf.in >${cwd}/scripts/bacula-sd-tape.conf sed -f ${out} ${cwd}/scripts/cleanup-tape.in >${cwd}/scripts/cleanup-tape +cp ${cwd}/bin/bacula-sd.conf /tmp/bac$$ +sed s%/tmp%${cwd}/tmp%g /tmp/bac$$ >${cwd}/bin/bacula-sd.conf chmod 777 ${cwd}/scripts/cleanup-tape rm -f ${out} +rm -f /tmp/bac$$ diff --git a/regress/scripts/test-bacula-sd.conf.in b/regress/scripts/test-bacula-sd.conf.in index d05bbf76ca..e3145d3221 100644 --- a/regress/scripts/test-bacula-sd.conf.in +++ b/regress/scripts/test-bacula-sd.conf.in @@ -35,7 +35,7 @@ Director { Device { Name = FileStorage Media Type = File - Archive Device = /tmp + Archive Device = @tmpdir@ LabelMedia = yes; # lets Bacula label unlabelled media Random Access = Yes; AutomaticMount = yes; # when device opened, read it diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape index 30fe11e88b..8f669b8164 100755 --- a/regress/tests/backup-bacula-tape +++ b/regress/tests/backup-bacula-tape @@ -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 2>&1 >/dev/null 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 01e925d653..dfda3bcccd 100755 --- a/regress/tests/backup-bacula-test +++ b/regress/tests/backup-bacula-test @@ -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 2>&1 >/dev/null if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " " diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test index 580b1b3efa..fc1310b6a4 100755 --- a/regress/tests/bextract-test +++ b/regress/tests/bextract-test @@ -45,7 +45,7 @@ mkdir -p ${cwd}/tmp/bacula-restores bin/bextract -b working/restore.bsr -c bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores 2>&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? -diff -r build tmp/bacula-restores${cwd}/build +diff -r build tmp/bacula-restores${cwd}/build 2>&1 >/dev/null if [ $? != 0 -o $bstat != 0 ] ; then echo " " echo " " diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test index 27e71505a6..aca7d1a773 100755 --- a/regress/tests/bscan-test +++ b/regress/tests/bscan-test @@ -69,7 +69,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 2>&1 >/dev/null if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " " diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test index efc9c5fac2..381166ff93 100755 --- a/regress/tests/bsr-opt-test +++ b/regress/tests/bsr-opt-test @@ -54,7 +54,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/src/cats tmp/bacula-restores${cwd}/build/src/cats +diff -r build/src/cats tmp/bacula-restores${cwd}/build/src/cats 2>&1 >/dev/null if [ $? != 0 -o $bsrstat != 1 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " " diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index 362d50591e..ac886b06e4 100755 --- a/regress/tests/compressed-test +++ b/regress/tests/compressed-test @@ -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 2>&1 >/dev/null if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " " diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test index 0ed3481f67..e02470e004 100755 --- a/regress/tests/concurrent-jobs-test +++ b/regress/tests/concurrent-jobs-test @@ -63,7 +63,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 tmp/largefile tmp/bacula-restores${cwd}/tmp/largefile +diff tmp/largefile tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " " diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root index 08c57f10cc..5ede9e7c0b 100755 --- a/regress/tests/dev-test-root +++ b/regress/tests/dev-test-root @@ -51,7 +51,7 @@ cd / ${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test dev >${cwd}/tmp/original cd /tmp/bacula-restores ${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test dev >${cwd}/tmp/restored -diff ${cwd}/tmp/original ${cwd}/tmp/restored +diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null if [ $? != 0 ] ; then echo " " echo " " diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root index dda8ed27b7..72f40f9786 100755 --- a/regress/tests/etc-test-root +++ b/regress/tests/etc-test-root @@ -51,7 +51,7 @@ cd / ${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test etc >${cwd}/tmp/original cd /tmp/bacula-restores ${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test etc >${cwd}/tmp/restored -diff ${cwd}/tmp/original ${cwd}/tmp/restored +diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null if [ $? != 0 ] ; then echo " " echo " " diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test index b9c4dc374e..0782fbd63c 100755 --- a/regress/tests/four-concurrent-jobs-test +++ b/regress/tests/four-concurrent-jobs-test @@ -64,7 +64,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 2>&1 >/dev/null if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " " diff --git a/regress/tests/lib-test-root b/regress/tests/lib-test-root index 056296214f..43aeb12eda 100755 --- a/regress/tests/lib-test-root +++ b/regress/tests/lib-test-root @@ -51,7 +51,7 @@ cd / ${cwd}/bin/testls -e ${cwd}/scripts/exclude-lib-test lib >${cwd}/tmp/original cd /tmp/bacula-restores ${cwd}/bin/testls -e ${cwd}/scripts/exclude-lib-test lib >${cwd}/tmp/restored -diff ${cwd}/tmp/original ${cwd}/tmp/restored +diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null if [ $? != 0 ] ; then echo " " echo " " diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test index 239de70cc5..0745b88e23 100755 --- a/regress/tests/recycle-test +++ b/regress/tests/recycle-test @@ -75,7 +75,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 2>&1 >/dev/null 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 fd253e7e95..22d4cc759b 100755 --- a/regress/tests/restore-by-file-test +++ b/regress/tests/restore-by-file-test @@ -12,7 +12,7 @@ cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build cd ${cwd}/tmp/build ls >../1 cd .. -sed s%^%${cwd}/tmp/build/% 1 >restore-list +sed s%\^%${cwd}/tmp/build/% 1 >restore-list rm -f 1 cd ${cwd} bin/bacula stop 2>&1 >/dev/null @@ -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 2>&1 >/dev/null if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " " diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test index d87f7e9521..73ce4e920d 100755 --- a/regress/tests/six-vol-test +++ b/regress/tests/six-vol-test @@ -52,7 +52,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 tmp/largefile tmp/bacula-restores${cwd}/tmp/largefile +diff tmp/largefile tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null 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 73344ddc25..743cc17ff8 100755 --- a/regress/tests/small-file-size-tape +++ b/regress/tests/small-file-size-tape @@ -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 2>&1 >/dev/null if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " " diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test index de1c30a265..a73dbfba0d 100755 --- a/regress/tests/span-vol-test +++ b/regress/tests/span-vol-test @@ -51,7 +51,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 2>&1 >/dev/null 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 9cc62ee0e5..3f2fcb9341 100755 --- a/regress/tests/sparse-compressed-test +++ b/regress/tests/sparse-compressed-test @@ -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 2>&1 >/dev/null if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " " diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test index ce2b10cddc..aaecc63342 100755 --- a/regress/tests/sparse-test +++ b/regress/tests/sparse-test @@ -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 2>&1 >/dev/null 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 d32b9befab..d848ce423f 100755 --- a/regress/tests/two-jobs-test +++ b/regress/tests/two-jobs-test @@ -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 2>&1 >/dev/null if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " " diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test index c318587f3a..53ca3cf8f8 100755 --- a/regress/tests/two-vol-test +++ b/regress/tests/two-vol-test @@ -47,7 +47,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 2>&1 >/dev/null 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 401b9af3ba..31c7d795ea 100755 --- a/regress/tests/two-volume-tape +++ b/regress/tests/two-volume-tape @@ -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 2>&1 >/dev/null if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then echo " " echo " "