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 822e43a4f26d4122a836aa1f43f34c0ed691ce30..b0e0823ae9cabd7e73922ff4372cab5b2a9ea133 100755 (executable)
--- 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 723289b57121f6c6eff46d7b7df74b56e4066d40..9eb8995c9ffdd4c859562a9cebd6cf88d5c1d062 100755 (executable)
--- 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 8ab0e6be9dd740c75ff991b013a7bc16d96d2145..b1b2b35e861654123e05969dc68db2fab706d589 100755 (executable)
--- 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 edeea9e5d8696eeac7362ffb015e16d4558cb1bd..9e50dd41329e8cb6cb981d26f3beabe41f99abe5 100755 (executable)
--- 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 24ce9cff9ae7affe951467a666f14f5a2e46d60a..a2ec32360c19fd17650cc5075912eec1837be5e7 100755 (executable)
--- 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 8efd332f1d5bfa6e7da29737692d09aabab065ce..b9c4dc374ee1786ed1849803df986667d17b5794 100755 (executable)
--- 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 a25d8bd9c631bc6f3f73bb8efcd908a56faafb06..22b89daffcc80532b8ba09857e2236356683ffa6 100755 (executable)
--- 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