From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 8 Aug 2003 16:44:20 +0000 (+0000)
Subject: Cleanup root tests
X-Git-Tag: Release-7.0.0~10031
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a11c5d95137a82a90b2f86980bbbb34cf233ff66;p=bacula%2Fbacula

Cleanup root tests


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

diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index 822e43a4f2..b0e0823ae9 100755
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -24,3 +24,4 @@ echo " "
 echo " "
 echo "Test results"
 cat test.out
+scripts/cleanup
diff --git a/regress/all-root-tests b/regress/all-root-tests
index 723289b571..9eb8995c9f 100755
--- a/regress/all-root-tests
+++ b/regress/all-root-tests
@@ -6,3 +6,4 @@ tests/dev-test-root
 tests/etc-test-root
 tests/lib-test-root
 cat test.out
+scripts/cleanup
diff --git a/regress/all-tests b/regress/all-tests
index 8ab0e6be9d..b1b2b35e86 100755
--- a/regress/all-tests
+++ b/regress/all-tests
@@ -5,3 +5,4 @@
 ./all-non-root-tests
 ./all-root-tests
 cat test.out
+scripts/cleanup
diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root
index edeea9e5d8..9e50dd4132 100755
--- a/regress/tests/dev-test-root
+++ b/regress/tests/dev-test-root
@@ -20,10 +20,10 @@ cwd=`pwd`
 scripts/copy-test-confs
 echo "/dev" >/tmp/file-list
 rm -rf /tmp/TestVolume001 /tmp/bacula-restores
-bin/bacula stop 
+bin/bacula stop 2>&1 >/dev/null
 bin/drop_sqlite_tables
 bin/make_sqlite_tables
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
@@ -46,12 +46,12 @@ messages
 @output
 quit
 END_OF_DATA
-bin/bacula stop
+bin/bacula stop 2>&1 >/dev/null
 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 /tmp/original /tmp/restored
+diff ${cwd}/tmp/original ${cwd}/tmp/restored
 if [ $? != 0 ] ; then
    echo " "
    echo " "
@@ -61,6 +61,5 @@ if [ $? != 0 ] ; then
 else
    echo "  ===== dev test OK ===== "
    echo "  ===== dev test OK ===== " >>test.out
-   rm -rf /tmp/bacula-restores ${cwd}/tmp/original ${cwd}/tmp/restored
-   rm -rf /tmp/file-list /tmp/job /tmp/TestVolume001
+   scripts/cleanup
 fi
diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root
index 24ce9cff9a..a2ec32360c 100755
--- a/regress/tests/etc-test-root
+++ b/regress/tests/etc-test-root
@@ -20,10 +20,10 @@ cwd=`pwd`
 scripts/copy-test-confs
 echo "/etc" >/tmp/file-list
 rm -rf /tmp/TestVolume001 /tmp/bacula-restores
-bin/bacula stop 
+bin/bacula stop 2>&1 >/dev/null
 bin/drop_sqlite_tables
 bin/make_sqlite_tables
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
@@ -46,7 +46,7 @@ messages
 @output
 quit
 END_OF_DATA
-bin/bacula stop
+bin/bacula stop 2>&1 >/dev/null
 cd /
 ${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test etc >${cwd}/tmp/original
 cd /tmp/bacula-restores
@@ -61,6 +61,5 @@ if [ $? != 0 ] ; then
 else
    echo "  ===== Test4 /etc OK ===== "
    echo "  ===== Test4 OK ===== " >>test.out
-   rm -rf /tmp/bacula-restores ${cwd}/tmp/original ${cwd}/tmp/restored
-   rm -rf /tmp/file-list /tmp/job /tmp/TestVolume001
+   scripts/cleanup
 fi
diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 8efd332f1d..b9c4dc374e 100755
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -16,7 +16,8 @@ echo " === Starting four-concurrent-jobs-test  ==="
 echo " === Starting four-concurrent-jobs-test  ===" >>working/log
 echo " "
 
-bin/bacula start 2>&1 >/dev/null
+#bin/bacula start 2>&1 >/dev/null
+bin/bacula start
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
diff --git a/regress/tests/lib-test-root b/regress/tests/lib-test-root
index a25d8bd9c6..22b89daffc 100755
--- a/regress/tests/lib-test-root
+++ b/regress/tests/lib-test-root
@@ -20,10 +20,10 @@ cwd=`pwd`
 scripts/copy-test-confs
 echo "/lib" >/tmp/file-list
 rm -rf /tmp/TestVolume001 /tmp/bacula-restores
-bin/bacula stop 
+bin/bacula stop 2>&1 >/dev/null
 bin/drop_sqlite_tables
 bin/make_sqlite_tables
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
@@ -46,7 +46,7 @@ messages
 @output
 quit
 END_OF_DATA
-bin/bacula stop
+bin/bacula stop 2>&1 >/dev/null
 cd /
 ${cwd}/bin/testls -e ${cwd}/scripts/exclude-lib-test lib >${cwd}/tmp/original
 cd /tmp/bacula-restores
@@ -61,6 +61,5 @@ if [ $? != 0 ] ; then
 else
    echo "  ===== Test5 /lib OK ===== "
    echo "  ===== Test5 OK ===== " >>test.out
-   rm -rf /tmp/bacula-restores ${cwd}/tmp/original ${cwd}/tmp/restored
-   rm -rf /tmp/file-list /tmp/job /tmp/TestVolume001
+   scripts/cleanup
 fi