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 7911e5d921eb81dfcc867481890fef7edc36d832..165a20484aaab6cb50a0582ee178829d19c5ea7a 100755 (executable)
--- 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 d05bbf76cacb85a651e061ecc6cf511fc5238731..e3145d322115ec42652b2d2c7a35e0fe38e4940f 100644 (file)
--- 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 30fe11e88bb220b46e7e44683266d92046a99c67..8f669b8164dd1c0c027fc43a6aaa1eb020cd2f20 100755 (executable)
--- 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 01e925d6537313d80b96368a55030bc8421eb4d2..dfda3bcccdcb5cde9bde341243c8f30bf51f983f 100755 (executable)
--- 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 580b1b3efac50d45c204bf1f9ee313aa1f0c13d0..fc1310b6a404e300fe78822c7d7d17a2baed595d 100755 (executable)
--- 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 27e71505a6b8a28822726916d5148b4e6316547a..aca7d1a77332efa998bc325a577efca1eb8d5fda 100755 (executable)
--- 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 efc9c5fac2cede4002765d172678182a1936f8d4..381166ff93747bf59801f72246bb9131d6f69016 100755 (executable)
--- 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 362d50591e545174d65d7d8c29e777f5e7e82200..ac886b06e4a9fda2403520c857eb3007643cf4f6 100755 (executable)
--- 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 0ed3481f67cf6c73e1e6f6886bcdcb296b5d6137..e02470e0046a816b3a615992498a1677e75831c5 100755 (executable)
--- 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 08c57f10cc3b575a2e84a2a24890ef53e9fb0ea8..5ede9e7c0b2049423937edf370f69d982d2397cc 100755 (executable)
--- 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 dda8ed27b77b86e3d71e90731c7706d5aed668ac..72f40f9786906259f85216507dff62055309a772 100755 (executable)
--- 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 b9c4dc374ee1786ed1849803df986667d17b5794..0782fbd63cb07605515c9f680354437481a41ab8 100755 (executable)
--- 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 056296214fd1a1240670edb07682984c6fb67874..43aeb12edafe5153601bea5c0ffc4598a41ce8ab 100755 (executable)
--- 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 239de70cc5faff867f43f3a330453b878cebfe77..0745b88e23cb1322de7e02c3b6815cf71d3c63ac 100755 (executable)
--- 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 fd253e7e95367c3a8e56c1560f5d1ed1d566ccef..22d4cc759bf52bad7ea3f8f5f465835cd77af344 100755 (executable)
--- 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 d87f7e95215931e287806cabd2a60e89f57429b0..73ce4e920d7ebc6ad85709280e91309fa294a3ee 100755 (executable)
--- 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 73344ddc250a144503d309d0ebc7f8d20dc4897a..743cc17ff8062ba0271c1f75dbcf89f6b228ce28 100755 (executable)
--- 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 de1c30a2655fc82e14ed8cc677730ae73254bba7..a73dbfba0d7685693ccbc2642d5503d0b292c24b 100755 (executable)
--- 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 9cc62ee0e530f0d1f3bc014477dc66fa87a14550..3f2fcb93411f6720a2614f4681e66b1b794ee65e 100755 (executable)
--- 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 ce2b10cddc7d93df0dd31d3605027b9f82187b37..aaecc63342a940c81e43abec6341f2ceeb947c73 100755 (executable)
--- 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 d32b9befabd1a01e48ad937caf0cd9dee7ff0119..d848ce423f27cce847d028a8589a425e2da0aac3 100755 (executable)
--- 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 c318587f3a499a6cfe839eb32aa723214425f739..53ca3cf8f8e9404663254ea55da797a853bfe90f 100755 (executable)
--- 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 401b9af3ba28d1bb4ca38992c01ca447bf927440..31c7d795eaa46bdb8a47bcaa6e96f1ce2c42a288 100755 (executable)
--- 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 " "